diff options
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/java/android/opengl/EGLLogWrapper.java | 10 | ||||
-rw-r--r-- | opengl/java/com/google/android/gles_jni/EGLImpl.java | 7 | ||||
-rw-r--r-- | opengl/java/javax/microedition/khronos/egl/EGL10.java | 2 | ||||
-rw-r--r-- | opengl/libs/EGL/egl_display.h | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/EGLLogWrapper.java b/opengl/java/android/opengl/EGLLogWrapper.java index 6c0fdb3..36e88a2 100644 --- a/opengl/java/android/opengl/EGLLogWrapper.java +++ b/opengl/java/android/opengl/EGLLogWrapper.java @@ -314,6 +314,16 @@ class EGLLogWrapper implements EGL11 { checkError(); return result; } + + /** @hide **/ + public boolean eglReleaseThread() { + begin("eglReleaseThread"); + end(); + boolean result = mEgl10.eglReleaseThread(); + returns(result); + checkError(); + return result; + } public boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface) { begin("eglInitialize"); diff --git a/opengl/java/com/google/android/gles_jni/EGLImpl.java b/opengl/java/com/google/android/gles_jni/EGLImpl.java index 51d6ca8..6992019 100644 --- a/opengl/java/com/google/android/gles_jni/EGLImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLImpl.java @@ -31,6 +31,8 @@ public class EGLImpl implements EGL10 { public native boolean eglInitialize(EGLDisplay display, int[] major_minor); public native boolean eglQueryContext(EGLDisplay display, EGLContext context, int attribute, int[] value); public native boolean eglQuerySurface(EGLDisplay display, EGLSurface surface, int attribute, int[] value); + /** @hide **/ + public native boolean eglReleaseThread(); public native boolean eglChooseConfig(EGLDisplay display, int[] attrib_list, EGLConfig[] configs, int config_size, int[] num_config); public native boolean eglGetConfigAttrib(EGLDisplay display, EGLConfig config, int attribute, int[] value); public native boolean eglGetConfigs(EGLDisplay display, EGLConfig[] configs, int config_size, int[] num_config); @@ -44,6 +46,9 @@ public class EGLImpl implements EGL10 { public native boolean eglCopyBuffers(EGLDisplay display, EGLSurface surface, Object native_pixmap); public native boolean eglWaitGL(); public native boolean eglWaitNative(int engine, Object bindTarget); + + /** @hide **/ + public static native int getInitCount(EGLDisplay display); public EGLContext eglCreateContext(EGLDisplay display, EGLConfig config, EGLContext share_context, int[] attrib_list) { int eglContextId = _eglCreateContext(display, config, share_context, attrib_list); @@ -85,7 +90,7 @@ public class EGLImpl implements EGL10 { eglSurfaceId = _eglCreateWindowSurface(display, config, sur, attrib_list); } else if (native_window instanceof SurfaceTexture) { eglSurfaceId = _eglCreateWindowSurfaceTexture(display, config, - (SurfaceTexture) native_window, attrib_list); + native_window, attrib_list); } else { throw new java.lang.UnsupportedOperationException( "eglCreateWindowSurface() can only be called with an instance of " + diff --git a/opengl/java/javax/microedition/khronos/egl/EGL10.java b/opengl/java/javax/microedition/khronos/egl/EGL10.java index 2ae793a..cf58888 100644 --- a/opengl/java/javax/microedition/khronos/egl/EGL10.java +++ b/opengl/java/javax/microedition/khronos/egl/EGL10.java @@ -114,6 +114,8 @@ public interface EGL10 extends EGL { boolean eglQueryContext(EGLDisplay display, EGLContext context, int attribute, int[] value); String eglQueryString(EGLDisplay display, int name); boolean eglQuerySurface(EGLDisplay display, EGLSurface surface, int attribute, int[] value); + /** @hide **/ + boolean eglReleaseThread(); boolean eglSwapBuffers(EGLDisplay display, EGLSurface surface); boolean eglTerminate(EGLDisplay display); boolean eglWaitGL(); diff --git a/opengl/libs/EGL/egl_display.h b/opengl/libs/EGL/egl_display.h index 1c1092c..e0a367d 100644 --- a/opengl/libs/EGL/egl_display.h +++ b/opengl/libs/EGL/egl_display.h @@ -91,6 +91,8 @@ public: inline bool isValid() const { return magic == '_dpy'; } inline bool isAlive() const { return isValid(); } + inline uint32_t getRefsCount() const { return refs; } + struct strings_t { char const * vendor; char const * version; |