Changeset 287075 in webkit

Timestamp:

Dec 15, 2021, 8:33:45 AM (5 years ago)

Author:

Chris Lord

Message:

[GTK] Use libgbm and the ANGLE gbm backend to fix initialisation
​https://bugs.webkit.org/show_bug.cgi?id=234293

Reviewed by Don Olmstead.

.:

Add cmake files to find gbm and libdrm.

• Source/cmake/FindGBM.cmake: Added.
• Source/cmake/FindLibDRM.cmake: Added.

Source/ThirdParty/ANGLE:

Use GBM backend for GTK platform.

• CMakeLists.txt:
• GL.cmake:
• PlatformGTK.cmake:

Source/WebCore:

Make ANGLE context non-TEXTURE_2D drawingBufferTextureTarget Cocoa-specific.

• platform/graphics/angle/GraphicsContextGLANGLE.cpp:

(WebCore::GraphicsContextGLANGLE::drawingBufferTextureTarget):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/CMakeLists.txt (modified) (1 diff)
• Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/GL.cmake (modified) (1 diff)
• Source/ThirdParty/ANGLE/PlatformGTK.cmake (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp (modified) (1 diff)
• Source/cmake/FindGBM.cmake (added)
• Source/cmake/FindLibDRM.cmake (added)

trunk/ChangeLog

@@ +1 @@
+2021-12-15  Chris Lord  <clord@igalia.com>
+
+        [GTK] Use libgbm and the ANGLE gbm backend to fix initialisation
+        https://bugs.webkit.org/show_bug.cgi?id=234293
+
+        Reviewed by Don Olmstead.
+
+        Add cmake files to find gbm and libdrm.
+
+        * Source/cmake/FindGBM.cmake: Added.
+        * Source/cmake/FindLibDRM.cmake: Added.
+
 2021-12-11  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Source/ThirdParty/ANGLE/CMakeLists.txt

@@ -10 +10 @@
 elseif (UNIX)
     set(is_linux TRUE)
-    if (ENABLE_X11_TARGET)
-        set(angle_use_x11 TRUE)
-    endif ()
+    set(ozone_platform_gbm TRUE)
 endif ()
 

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-12-15  Chris Lord  <clord@igalia.com>
+
+        [GTK] Use libgbm and the ANGLE gbm backend to fix initialisation
+        https://bugs.webkit.org/show_bug.cgi?id=234293
+
+        Reviewed by Don Olmstead.
+
+        Use GBM backend for GTK platform.
+
+        * CMakeLists.txt:
+        * GL.cmake:
+        * PlatformGTK.cmake:
+
 2021-12-15  Kyle Piddington  <kpiddington@apple.com>
 

trunk/Source/ThirdParty/ANGLE/GL.cmake

@@ -164 +164 @@
         "src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h"
     )
-
-    pkg_config("src/libANGLE/renderer/gl/libdrm") 
-    set(packages "src/libANGLE/renderer/gl/libdrm" )
 endif()
 

trunk/Source/ThirdParty/ANGLE/PlatformGTK.cmake

@@ -23 +23 @@
     list(APPEND ANGLE_DEFINITIONS
         ANGLE_ENABLE_OPENGL
+        ANGLE_USE_GBM
+        USE_SYSTEM_EGL
+    )
+
+    find_package(LibDRM REQUIRED)
+    find_package(GBM REQUIRED)
+
+    list(APPEND ANGLE_PRIVATE_INCLUDE_DIRECTORIES
+        ${LIBDRM_INCLUDE_DIR}
+        {GBM_INCLUDE_DIR}
     )
 
     list(APPEND ANGLEGLESv2_LIBRARIES
         ${CMAKE_DL_LIBS}
+        ${LIBDRM_LIBRARIES}
+        ${GBM_LIBRARIES}
         Threads::Threads
     )
@@ -35 +47 @@
         list(APPEND ANGLEGLESv2_LIBRARIES OpenGL::GLES)
     endif ()
-
-    # NOTE: When both Wayland and X11 are enabled, ANGLE_USE_X11 will be
-    # defined and the X11 type definitions will be used for code involving
-    # both. That works because types for both Wayland and X11 have the same
-    # sizes and the code in WebKit casts the values to the proper types as
-    # needed.
-    set(GTK_ANGLE_DEFINITIONS)
-
-    if (ENABLE_X11_TARGET)
-        list(APPEND ANGLE_SOURCES ${libangle_gl_glx_sources})
-        list(APPEND ANGLEGLESv2_LIBRARIES X11)
-        list(APPEND GTK_ANGLE_DEFINITIONS ANGLE_USE_X11)
-    endif ()
-
-    # Allow building ANGLE on platforms which may not provide X11 headers.
-    if (NOT GTK_ANGLE_DEFINITIONS)
-        list(APPEND GTK_ANGLE_DEFINITIONS USE_SYSTEM_EGL)
-    endif ()
-
-    list(APPEND ANGLE_DEFINITIONS ${GTK_ANGLE_DEFINITIONS})
 endif ()

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-15  Chris Lord  <clord@igalia.com>
+
+        [GTK] Use libgbm and the ANGLE gbm backend to fix initialisation
+        https://bugs.webkit.org/show_bug.cgi?id=234293
+
+        Reviewed by Don Olmstead.
+
+        Make ANGLE context non-TEXTURE_2D drawingBufferTextureTarget Cocoa-specific.
+
+        * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+        (WebCore::GraphicsContextGLANGLE::drawingBufferTextureTarget):
+
 2021-12-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -74 +74 @@
 GCGLenum GraphicsContextGLANGLE::drawingBufferTextureTarget()
 {
-#if PLATFORM(WIN)
+#if !PLATFORM(COCOA)
     m_drawingBufferTextureTarget = EGL_TEXTURE_2D;
 #else