Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c06d659 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am c698c9cc: am a1300467: Merge "Enable use of Surface as a native window in... 

am c698c9cc: am a1300467: Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev

* commit 'c698c9cc':
  Enable use of Surface as a native window in EGL14 wrapper.
parents 415e6ba0 c698c9cc

opengl/java/android/opengl/EGL14.java

+3 −1
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; 
        } else if (win instanceof SurfaceHolder) {

            SurfaceHolder holder = (SurfaceHolder)win;

            sur = holder.getSurface();

        } else if (win instanceof Surface) {

            sur = (Surface) win;

        }



        EGLSurface surface;
@@ -259,7 +261,7 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; 
        } else {

            throw new java.lang.UnsupportedOperationException(

                "eglCreateWindowSurface() can only be called with an instance of " +

                "SurfaceView, SurfaceTexture or SurfaceHolder at the moment, " +

                "Surface, SurfaceView, SurfaceTexture or SurfaceHolder at the moment, " +

                "this will be fixed later.");

        }