GL: Rename getEglSurface to createEglSurface.

Per documentation, eglCreateWindowSurface creates a new EGL window surface. getEglSurface suggests instead that a pre-existing surface is returned. https://registry.khronos.org/EGL/sdk/docs/man/html/eglCreateWindowSurface.xhtml PiperOrigin-RevId: 488377423
androidx · Nov 14, 2022 · 095c52e · 095c52e
1 parent 30b73c8
commit 095c52e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/GlUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
@@ -255,7 +255,7 @@ public static EGLContext createEglContext(EGLDisplay eglDisplay, int[] configAtt
   }
 
   /**
-   * Returns a new {@link EGLSurface} wrapping the specified {@code surface}.
+   * Creates a new {@link EGLSurface} wrapping the specified {@code surface}.
    *
    * <p>The {@link EGLSurface} will configure with {@link #EGL_CONFIG_ATTRIBUTES_RGBA_8888} and
    * OpenGL ES 2.0.
@@ -264,24 +264,23 @@ public static EGLContext createEglContext(EGLDisplay eglDisplay, int[] configAtt
    * @param surface The surface to wrap; must be a surface, surface texture or surface holder.
    */
   @RequiresApi(17)
-  public static EGLSurface getEglSurface(EGLDisplay eglDisplay, Object surface) throws GlException {
-    return Api17.getEglSurface(
-        eglDisplay, surface, EGL_CONFIG_ATTRIBUTES_RGBA_8888, EGL_WINDOW_SURFACE_ATTRIBUTES_NONE);
+  public static EGLSurface createEglSurface(EGLDisplay eglDisplay, Object surface)
+      throws GlException {
+    return Api17.createEglSurface(eglDisplay, surface, EGL_CONFIG_ATTRIBUTES_RGBA_8888);
   }
 
   /**
-   * Returns a new {@link EGLSurface} wrapping the specified {@code surface}.
+   * Creates a new {@link EGLSurface} wrapping the specified {@code surface}.
    *
    * @param eglDisplay The {@link EGLDisplay} to attach the surface to.
    * @param surface The surface to wrap; must be a surface, surface texture or surface holder.
    * @param configAttributes The attributes to configure EGL with. Accepts {@link
    *     #EGL_CONFIG_ATTRIBUTES_RGBA_1010102} and {@link #EGL_CONFIG_ATTRIBUTES_RGBA_8888}.
    */
   @RequiresApi(17)
-  public static EGLSurface getEglSurface(
+  public static EGLSurface createEglSurface(
       EGLDisplay eglDisplay, Object surface, int[] configAttributes) throws GlException {
-    return Api17.getEglSurface(
-        eglDisplay, surface, configAttributes, EGL_WINDOW_SURFACE_ATTRIBUTES_NONE);
+    return Api17.createEglSurface(eglDisplay, surface, configAttributes);
   }
 
   /**
@@ -659,18 +658,14 @@ public static EGLContext createEglContext(
     }
 
     @DoNotInline
-    public static EGLSurface getEglSurface(
-        EGLDisplay eglDisplay,
-        Object surface,
-        int[] configAttributes,
-        int[] windowSurfaceAttributes)
-        throws GlException {
+    public static EGLSurface createEglSurface(
+        EGLDisplay eglDisplay, Object surface, int[] configAttributes) throws GlException {
       EGLSurface eglSurface =
           EGL14.eglCreateWindowSurface(
               eglDisplay,
               getEglConfig(eglDisplay, configAttributes),
               surface,
-              windowSurfaceAttributes,
+              EGL_WINDOW_SURFACE_ATTRIBUTES_NONE,
               /* offset= */ 0);
       checkEglException("Error creating surface");
       return eglSurface;

diff --git a/...rc/main/java/com/google/android/exoplayer2/effect/FinalMatrixTextureProcessorWrapper.java b/...rc/main/java/com/google/android/exoplayer2/effect/FinalMatrixTextureProcessorWrapper.java
@@ -317,7 +317,7 @@ private synchronized boolean ensureConfigured(int inputWidth, int inputHeight)
       boolean colorInfoIsHdr = ColorInfo.isTransferHdr(colorInfo);
 
       outputEglSurface =
-          GlUtil.getEglSurface(
+          GlUtil.createEglSurface(
               eglDisplay,
               outputSurfaceInfo.surface,
               colorInfoIsHdr
@@ -445,7 +445,7 @@ public synchronized void maybeRenderToSurfaceView(FrameProcessingTask renderingT
 
       if (eglSurface == null) {
         eglSurface =
-            GlUtil.getEglSurface(
+            GlUtil.createEglSurface(
                 eglDisplay,
                 surface,
                 useHdr