From 0283f151a3e12a064f47c54d1e663deb4f06b50e Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sun, 13 Dec 2020 10:20:43 +0700 Subject: [PATCH] [EGLBridge] back --- app/src/main/jni/egl_bridge.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/jni/egl_bridge.c b/app/src/main/jni/egl_bridge.c index 3304281b0..f19fb0950 100644 --- a/app/src/main/jni/egl_bridge.c +++ b/app/src/main/jni/egl_bridge.c @@ -65,6 +65,10 @@ JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglGetCurrentContext(JNIE } JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, jclass clazz) { + return JNI_TRUE; +} + +JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz, jlong window) { static const EGLint ctx_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE @@ -148,15 +152,11 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, j printf("EGLBridge: OpenGL ES from eglQueryContext: %i\n", val); // assert(val >= 2); } - - return JNI_TRUE; -} -JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz, jlong window) { printf("EGLBridge: Making current\n"); printf("EGLBridge: ThreadID=%d, WindowID=%p\n", gettid(), window); printf("EGLBridge: EGLContext=%p, EGLDisplay=%p, EGLSurface=%p\n", - window==0 ? EGL_NO_CONTEXT : potatoBridge.eglContext, + /* window==0 ? EGL_NO_CONTEXT : */ potatoBridge.eglContext, potatoBridge.eglDisplay, potatoBridge.eglSurface ); @@ -165,7 +165,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* potatoBridge.eglDisplay, potatoBridge.eglSurface, potatoBridge.eglSurface, - window==0 ? EGL_NO_CONTEXT : potatoBridge.eglContext + /* window==0 ? EGL_NO_CONTEXT : */ potatoBridge.eglContext ); if (success == EGL_FALSE) { printf("Error: eglMakeCurrent() failed: %p\n", eglGetError());