Changeset 252851 in webkit

Timestamp:

Nov 25, 2019 2:08:39 AM (4 years ago)

Author:

ChangSeok Oh

Message:

[GTK] Check EGL image extension by using native gl API in AcceleratedBackingStoreWayland
​https://bugs.webkit.org/show_bug.cgi?id=204446

Reviewed by Carlos Garcia Campos.

This change is part of efforts bringing ANGLE backend for WebGL to the gtk port.
When ANGLE WebGL is enabled, we face a dilemma of choosing either Extensions3DANGLE
or Extensions3DOpenGL in AcceleratedBackingStoreWayland.cpp. Since they cannot
coexist, we chose Extensions3DANGLE even if what we really want is Extensions3DOepnGL.
We address this problem by directly checking egl image extension availability
via native GL API rather than relying on Extensions3D* classes in the file.

• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:

(WebKit::isEGLImageAvailable):
(WebKit::AcceleratedBackingStoreWayland::checkRequirements):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-25  ChangSeok Oh  <changseok@webkit.org>
+
+        [GTK] Check EGL image extension by using native gl API in AcceleratedBackingStoreWayland
+        https://bugs.webkit.org/show_bug.cgi?id=204446
+
+        Reviewed by Carlos Garcia Campos.
+
+        This change is part of efforts bringing ANGLE backend for WebGL to the gtk port.
+        When ANGLE WebGL is enabled, we face a dilemma of choosing either Extensions3DANGLE
+        or Extensions3DOpenGL in AcceleratedBackingStoreWayland.cpp. Since they cannot
+        coexist, we chose Extensions3DANGLE even if what we really want is Extensions3DOepnGL.
+        We address this problem by directly checking egl image extension availability
+        via native GL API rather than relying on Extensions3D* classes in the file.
+
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        (WebKit::isEGLImageAvailable):
+        (WebKit::AcceleratedBackingStoreWayland::checkRequirements):
+
 2019-11-25  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp

@@ -39 +39 @@
 #include <WebCore/GLContext.h>
 
-#if USE(ANGLE)
-#include <WebCore/Extensions3DANGLE.h>
-#include <WebCore/OpenGLShims.h>
-#elif USE(OPENGL_ES)
+#if USE(OPENGL_ES)
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
-#include <WebCore/Extensions3DOpenGLES.h>
-#else
-#include <WebCore/Extensions3DOpenGL.h>
+#else
 #include <WebCore/OpenGLShims.h>
 #endif
@@ -67 +62 @@
 namespace WebKit {
 using namespace WebCore;
+
+bool isEGLImageAvailable(bool useIndexedGetString)
+{
+#if USE(OPENGL_ES)
+    UNUSED_PARAM(useIndexedGetString);
+#else
+    if (useIndexedGetString) {
+        GLint numExtensions = 0;
+        ::glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
+        for (GLint i = 0; i < numExtensions; ++i) {
+            String extension = String(reinterpret_cast<const char*>(glGetStringi(GL_EXTENSIONS, i)));
+            if (extension == "GL_OES_EGL_image" || extension == "GL_OES_EGL_image_external")
+                return true;
+        }
+    } else
+#endif
+    {
+        String extensionsString = String(reinterpret_cast<const char*>(::glGetString(GL_EXTENSIONS)));
+        for (auto& extension : extensionsString.split(' ')) {
+            if (extension == "GL_OES_EGL_image" || extension == "GL_OES_EGL_image_external")
+                return true;
+        }
+    }
+
+    return false;
+}
 
 bool AcceleratedBackingStoreWayland::checkRequirements()
@@ -82 +103 @@
             return false;
 
-#if USE(ANGLE)
-        std::unique_ptr<Extensions3DANGLE> glExtensions = makeUnique<Extensions3DANGLE>(nullptr, GLContext::current()->version() >= 320);
-#elif USE(OPENGL_ES)
-        std::unique_ptr<Extensions3DOpenGLES> glExtensions = makeUnique<Extensions3DOpenGLES>(nullptr,  false);
-#else
-        std::unique_ptr<Extensions3DOpenGL> glExtensions = makeUnique<Extensions3DOpenGL>(nullptr, GLContext::current()->version() >= 320);
-#endif
-        if (glExtensions->supports("GL_OES_EGL_image") || glExtensions->supports("GL_OES_EGL_image_external"))
+#if USE(OPENGL_ES)
+        if (isEGLImageAvailable(false))
+#else
+        if (isEGLImageAvailable(GLContext::current()->version() >= 320))
+#endif
             glImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
     }