Changeset 286978 in webkit

Timestamp:

Dec 13, 2021, 1:16:28 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fix ANGLE compilation
​https://bugs.webkit.org/show_bug.cgi?id=233327

Patch by Alejandro G. Castro <​alex@igalia.com> on 2021-12-13
Reviewed by Kenneth Russell.

Source/ThirdParty/ANGLE:

There is a define with a typo in the name and activating EGL and
X11 does not work at the same time.

• PlatformGTK.cmake:

Source/WebCore:

No tests required.

Fixed the issues to make the engine work with -DUSE_ANGLE_WEBGL=ON
defined.

• platform/graphics/GLContext.cpp:

(WebCore::initializeOpenGLShimsIfNeeded): In case of GTK and WPE
initially we are going to keep TextureMapper using system GL
libraries, even when we are using ANGLE for WebGL, so we need the
shims definitions.

• platform/graphics/nicosia/texmap/NicosiaGCGLLayer.cpp:

(Nicosia::GCGLLayer::swapBuffersIfNeeded): We need to allocate and
update the layer buffer in the compositor thread to make sure it
is handled in just one thread.

Location:

trunk/Source

Files:

• ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• ThirdParty/ANGLE/PlatformGTK.cmake (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GLContext.cpp (modified) (1 diff)
• WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h (modified) (2 diffs)
• WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp (modified) (1 diff)
• WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLLayer.cpp (modified) (2 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-12-13  Alejandro G. Castro  <alex@igalia.com>
+
+        [GTK] Fix ANGLE compilation
+        https://bugs.webkit.org/show_bug.cgi?id=233327
+
+        Reviewed by Kenneth Russell.
+
+        There is a define with a typo in the name and activating EGL and
+        X11 does not work at the same time.
+
+        * PlatformGTK.cmake:
+
 2021-12-13  Kyle Piddington  <kpiddington@apple.com>
 

trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake

@@ -49 +49 @@
     endif ()
 
-    if (ENABLE_WAYLAND_TARGET)
-        list(APPEND GKT_ANGLE_DEFINITIONS WL_EGL_PLATFORM)
-    endif ()
-
     # Allow building ANGLE on platforms which may not provide X11 headers.
     if (NOT GTK_ANGLE_DEFINITIONS)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-13  Alejandro G. Castro  <alex@igalia.com>
+
+        [GTK] Fix ANGLE compilation
+        https://bugs.webkit.org/show_bug.cgi?id=233327
+
+        Reviewed by Kenneth Russell.
+
+        No tests required.
+
+        Fixed the issues to make the engine work with -DUSE_ANGLE_WEBGL=ON
+        defined.
+
+        * platform/graphics/GLContext.cpp:
+        (WebCore::initializeOpenGLShimsIfNeeded): In case of GTK and WPE
+        initially we are going to keep TextureMapper using system GL
+        libraries, even when we are using ANGLE for WebGL, so we need the
+        shims definitions.
+        * platform/graphics/nicosia/texmap/NicosiaGCGLLayer.cpp:
+        (Nicosia::GCGLLayer::swapBuffersIfNeeded): We need to allocate and
+        update the layer buffer in the compositor thread to make sure it
+        is handled in just one thread.
+
 2021-12-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/GLContext.cpp

@@ -59 +59 @@
 static bool initializeOpenGLShimsIfNeeded()
 {
-#if USE(OPENGL_ES) || USE(LIBEPOXY) || USE(ANGLE)
+#if USE(OPENGL_ES) || USE(LIBEPOXY) || (USE(ANGLE) && !(PLATFORM(GTK) || PLATFORM(WPE)))
     return true;
 #else

trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h

@@ -43 +43 @@
 #if USE(NICOSIA)
 namespace Nicosia {
+class GCGLANGLELayer;
 class GCGLLayer;
 }
@@ -446 +447 @@
 #endif
 #if USE(NICOSIA)
-    std::unique_ptr<Nicosia::GCGLLayer> m_nicosiaLayer;
+    std::unique_ptr<Nicosia::GCGLANGLELayer> m_nicosiaLayer;
 #elif USE(TEXTURE_MAPPER)
     std::unique_ptr<TextureMapperGCGLPlatformLayer> m_texmapLayer;

trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.cpp

@@ -145 +145 @@
 {
     if (m_context) {
-        gl::BindFramebuffer(GL_FRAMEBUFFER, 0);
+        GL_BindFramebuffer(GL_FRAMEBUFFER, 0);
         EGL_MakeCurrent(m_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
         EGL_DestroyContext(m_display, m_context);

trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLLayer.cpp

@@ -87 +87 @@
 
     m_context.paintRenderingResultsToCanvas(*imageBuffer.get());
-    RefPtr<Image> image = imageBuffer->copyImage(DontCopyBackingStore);
-    if (!image)
-        return;
 #else
     flags |= TextureMapperGL::ShouldFlipTexture;
@@ -97 +94 @@
         auto& proxy = downcast<Nicosia::ContentLayerTextureMapperImpl>(m_contentLayer->impl()).proxy();
 #if USE(ANGLE)
-        std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer;
-        layerBuffer = proxy.getAvailableBuffer(textureSize, m_context.m_internalColorFormat);
-        if (!layerBuffer) {
-            auto texture = BitmapTextureGL::create(TextureMapperContextAttributes::get(), flags, m_context.m_internalColorFormat);
-            static_cast<BitmapTextureGL&>(texture.get()).setPendingContents(WTFMove(image));
-            layerBuffer = makeUnique<TextureMapperPlatformLayerBuffer>(WTFMove(texture), flags);
-        } else
-            layerBuffer->textureGL().setPendingContents(WTFMove(image));
+        auto proxyOperation =
+            [this, textureSize, flags, imageBuffer = WTFMove(imageBuffer)] () {
+                RefPtr<Image> image = imageBuffer->copyImage(DontCopyBackingStore);
+                if (!image)
+                    return;
 
-        Locker locker { proxy.lock() };
-        proxy.pushNextBuffer(WTFMove(layerBuffer));
+                std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer;
+                auto& proxy = downcast<Nicosia::ContentLayerTextureMapperImpl>(m_contentLayer->impl()).proxy();
+                Locker locker { proxy.lock() };
+                layerBuffer = proxy.getAvailableBuffer(textureSize, m_context.m_internalColorFormat);
+
+                if (!layerBuffer) {
+                    auto texture = BitmapTextureGL::create(TextureMapperContextAttributes::get(), flags, m_context.m_internalColorFormat);
+                    static_cast<BitmapTextureGL&>(texture.get()).setPendingContents(WTFMove(image));
+                    layerBuffer = makeUnique<TextureMapperPlatformLayerBuffer>(WTFMove(texture), flags);
+                } else
+                    layerBuffer->textureGL().setPendingContents(WTFMove(image));
+
+                proxy.pushNextBuffer(WTFMove(layerBuffer));
+
+                m_context.markLayerComposited();
+            };
+
+        proxy.scheduleUpdateOnCompositorThread([proxyOperation] {
+            proxyOperation();
+        });
+
+        return;
 #else
         Locker locker { proxy.lock() };