wip 2

PhoneVR-Developers · Dec 11, 2024 · 2a2ecf5 · 2a2ecf5
1 parent 7215104
commit 2a2ecf5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/code/mobile/android/PhoneVR/app/src/main/cpp/alvr_main.cpp b/code/mobile/android/PhoneVR/app/src/main/cpp/alvr_main.cpp
@@ -238,12 +238,11 @@ void makeGLContextCurrent() {
         CTX.cachedEglConfig = true;
     }
 
-    if (!eglMakeCurrent(CTX.eglCurrentDisplay,
-                        CTX.eglCurrentDrawSurface,
-                        CTX.eglCurrentReadSurface,
-                        CTX.eglCurrentContext)) {
-        error("eglMakeCurrent() returned error %s", eglGetErrorString());
-    }
+    GL(eglMakeCurrent(CTX.eglCurrentDisplay,
+                      CTX.eglCurrentDrawSurface,
+                      CTX.eglCurrentReadSurface,
+                      CTX.eglCurrentContext));
+    info("eglMakeCurrent() returned error %s", eglGetErrorString());
 }
 
 extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_destroyNative(JNIEnv *,

diff --git a/code/mobile/android/PhoneVR/app/src/main/cpp/utils.h b/code/mobile/android/PhoneVR/app/src/main/cpp/utils.h
@@ -101,8 +101,7 @@ const char *eglGetErrorString() {
 
 void makeGLContextCurrent();
 
-#define EGL_MAKE_CURRENT(func)                                                                     \
-    func;                                                                                          \
-    makeGLContextCurrent()
+#define EGL_MAKE_CURRENT(func) func;
+// makeGLContextCurrent()
 
 #endif   // PHONEVR_UTILS_H