Check for egl color space support before trying to use it to avoid cr…

…ashing Reviewed By: corporateshark, arhelmus Differential Revision: D66387404 fbshipit-source-id: d25d033c402c3c28dd4e9ce41ab2d70c714dcd75
facebook · Nov 22, 2024 · b21f5c2 · b21f5c2
1 parent 3ae0635
commit b21f5c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/build/android/app/src/main/java/com/facebook/igl/sample/SampleView.java b/build/android/app/src/main/java/com/facebook/igl/sample/SampleView.java
@@ -130,6 +130,10 @@ private static class SurfaceFactory implements GLSurfaceView.EGLWindowSurfaceFac
     @Override
     public EGLSurface createWindowSurface(
         EGL10 egl10, EGLDisplay eglDisplay, EGLConfig eglConfig, Object nativeWindow) {
+      String eglExtensionString = egl10.eglQueryString(eglDisplay, egl10.EGL_EXTENSIONS);
+      if (!eglExtensionString.contains("EGL_KHR_gl_colorspace")) {
+        return egl10.eglCreateWindowSurface(eglDisplay, eglConfig, nativeWindow, null);
+      }
       int[] configAttribs = {
         EGL_GL_COLORSPACE_KHR,
         (mIsSRGBColorSpace ? EGL_GL_COLORSPACE_SRGB_KHR : EGL_GL_COLORSPACE_LINEAR_KHR),

diff --git a/shell/android/java/com/facebook/igl/sample/SampleView.java b/shell/android/java/com/facebook/igl/sample/SampleView.java
@@ -130,6 +130,11 @@ private static class SurfaceFactory implements GLSurfaceView.EGLWindowSurfaceFac
     @Override
     public EGLSurface createWindowSurface(
         EGL10 egl10, EGLDisplay eglDisplay, EGLConfig eglConfig, Object nativeWindow) {
+
+      String eglExtensionString = egl10.eglQueryString(eglDisplay, egl10.EGL_EXTENSIONS);
+      if (!eglExtensionString.contains("EGL_KHR_gl_colorspace")) {
+        return egl10.eglCreateWindowSurface(eglDisplay, eglConfig, nativeWindow, null);
+      }
       int[] configAttribs = {
         EGL_GL_COLORSPACE_KHR,
         (mIsSRGBColorSpace ? EGL_GL_COLORSPACE_SRGB_KHR : EGL_GL_COLORSPACE_LINEAR_KHR),