Changeset 271220 in webkit

Timestamp:

Jan 6, 2021, 4:49:55 PM (6 years ago)

Author:

Fujii Hironori

Message:

[GTK][CMake] Add a build switch USE_OPENGL_OR_ES to be able to disable OpenGL and ES
​https://bugs.webkit.org/show_bug.cgi?id=220183

Reviewed by Kenneth Russell.

.:

r270477 removed ENABLE_GRAPHICS_CONTEXT_GL macro and build switch,
but GTK port still needs the build switch. Revert r270477
partially to restore the build switch and rename it to
USE_OPENGL_OR_ES.

• Source/cmake/OptionsGTK.cmake:

Source/WebCore:

• platform/graphics/x11/PlatformDisplayX11.cpp: Include <X11/Xutil.h> for XGetVisualInfo.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (4 diffs)

trunk/ChangeLog

@@ +1 @@
+2021-01-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK][CMake] Add a build switch USE_OPENGL_OR_ES to be able to disable OpenGL and ES
+        https://bugs.webkit.org/show_bug.cgi?id=220183
+
+        Reviewed by Kenneth Russell.
+
+        r270477 removed ENABLE_GRAPHICS_CONTEXT_GL macro and build switch,
+        but GTK port still needs the build switch. Revert r270477
+        partially to restore the build switch and rename it to
+        USE_OPENGL_OR_ES.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2021-01-05  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-06  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK][CMake] Add a build switch USE_OPENGL_OR_ES to be able to disable OpenGL and ES
+        https://bugs.webkit.org/show_bug.cgi?id=220183
+
+        Reviewed by Kenneth Russell.
+
+        * platform/graphics/x11/PlatformDisplayX11.cpp: Include <X11/Xutil.h> for XGetVisualInfo.
+
 2021-01-06  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp

@@ -33 +33 @@
 #include <X11/extensions/Xcomposite.h>
 #if PLATFORM(GTK)
+#include <X11/Xutil.h>
 #include <X11/extensions/Xdamage.h>
 #endif

trunk/Source/cmake/OptionsGTK.cmake

@@ -73 +73 @@
 endif ()
 
-# Set the default value for ENABLE_GLES2 automatically.
-# We are not enabling or disabling automatically a feature here, because
-# the feature is by default always on.
-# What we select here automatically is if we use OPENGL (ENABLE_GLES2=OFF)
-# or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
+# Set the default value for ENABLE_GLES2 and USE_OPENGL_OR_ES.
 set(ENABLE_GLES2_DEFAULT OFF)
+set(USE_OPENGL_OR_ES_DEFAULT OFF)
 
 if (OPENGLES2_FOUND AND (NOT OPENGL_FOUND OR WTF_CPU_ARM OR WTF_CPU_ARM64))
     set(ENABLE_GLES2_DEFAULT ON)
+endif ()
+
+if (OPENGL_FOUND OR OPENGLES2_FOUND)
+    set(USE_OPENGL_OR_ES_DEFAULT ON)
 endif ()
 
@@ -96 +97 @@
 WEBKIT_OPTION_DEFINE(USE_LIBHYPHEN "Whether to enable the default automatic hyphenation implementation." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential storage using libsecret." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(USE_OPENGL_OR_ES "Whether to use OpenGL or ES." PUBLIC ${USE_OPENGL_OR_ES_DEFAULT})
 WEBKIT_OPTION_DEFINE(USE_OPENJPEG "Whether to enable support for JPEG2000 images." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
@@ -105 +107 @@
 WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
 
+WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS USE_OPENGL_OR_ES)
+WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING USE_OPENGL_OR_ES)
+WEBKIT_OPTION_DEPEND(ENABLE_GLES2 USE_OPENGL_OR_ES)
+WEBKIT_OPTION_DEPEND(ENABLE_WEBGL USE_OPENGL_OR_ES)
 WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL)
+WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL USE_OPENGL_OR_ES)
+WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER USE_OPENGL_OR_ES)
 WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_WAYLAND_TARGET)
 
@@ -267 +275 @@
 SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
 
-if (OPENGL_FOUND OR ENABLE_GLES2)
+if (USE_OPENGL_OR_ES)
     # USE_OPENGL is the opposite of ENABLE_GLES2.
     if (ENABLE_GLES2)