Changeset 260760 in webkit

Timestamp:

Apr 27, 2020 9:18:09 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] ENABLE(OPENGL) remmants...
​https://bugs.webkit.org/show_bug.cgi?id=211077

Patch by Philippe Normand <​pnormand@igalia.com> on 2020-04-27
Reviewed by Adrian Perez de Castro.

ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in
r254064 but not in all the code base...
.:

• Source/cmake/GStreamerDependencies.cmake:
• Source/cmake/OptionsGTK.cmake:

Source/WebKit:

• UIProcess/gtk/HardwareAccelerationManager.cpp:

(WebKit::HardwareAccelerationManager::HardwareAccelerationManager):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.cpp (modified) (1 diff)
• Source/cmake/GStreamerDependencies.cmake (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (6 diffs)

trunk/ChangeLog

@@ +1 @@
+2020-04-27  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] ENABLE(OPENGL) remmants...
+        https://bugs.webkit.org/show_bug.cgi?id=211077
+
+        Reviewed by Adrian Perez de Castro.
+
+        ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in
+        r254064 but not in all the code base...
+
+        * Source/cmake/GStreamerDependencies.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+
 2020-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-27  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] ENABLE(OPENGL) remmants...
+        https://bugs.webkit.org/show_bug.cgi?id=211077
+
+        Reviewed by Adrian Perez de Castro.
+
+        ENABLE(OPENGL) was renamed to ENABLE(GRAPHICS_CONTEXT_GL) in
+        r254064 but not in all the code base...
+        
+        * UIProcess/gtk/HardwareAccelerationManager.cpp:
+        (WebKit::HardwareAccelerationManager::HardwareAccelerationManager):
+
 2020-04-27  Daniel Bates  <dabates@apple.com>
 

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

@@ -42 +42 @@
     , m_forceHardwareAcceleration(false)
 {
-#if !ENABLE(OPENGL)
+#if !ENABLE(GRAPHICS_CONTEXT_GL)
     m_canUseHardwareAcceleration = false;
     return;

trunk/Source/cmake/GStreamerDependencies.cmake

@@ -1 +1 @@
 if (PORT STREQUAL "GTK")
-  WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
+  WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_GRAPHICS_CONTEXT_GL)
 endif ()
 WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)

trunk/Source/cmake/OptionsGTK.cmake

@@ -75 +75 @@
 # 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 (ENABLE_OPENGL=ON).
+# the feature is by default always on (ENABLE_GRAPHICS_CONTEXT_GL=ON).
 # What we select here automatically is if we use OPENGL (ENABLE_GLES2=OFF)
 # or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
@@ -90 +90 @@
 WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
 WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
-WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(ENABLE_GRAPHICS_CONTEXT_GL "Whether to use OpenGL." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK_SUPPORTS_QUARTZ})
 WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK_SUPPORTS_X11})
@@ -109 +109 @@
 WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
 
-WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
-WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
+WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_GRAPHICS_CONTEXT_GL)
+WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_GRAPHICS_CONTEXT_GL)
 WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL)
-WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_OPENGL)
+WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_GRAPHICS_CONTEXT_GL)
 WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_WAYLAND_TARGET)
 
@@ -296 +296 @@
 SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
 
-if (ENABLE_OPENGL)
-    # ENABLE_OPENGL is true if either USE_OPENGL or ENABLE_GLES2 is true.
+if (ENABLE_GRAPHICS_CONTEXT_GL)
+    # ENABLE_GRAPHICS_CONTEXT_GL is true if either USE_OPENGL or ENABLE_GLES2 is true.
     # But USE_OPENGL is the opposite of ENABLE_GLES2.
     if (ENABLE_GLES2)
@@ -309 +309 @@
     else ()
         if (NOT OPENGL_FOUND)
-            message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_OPENGL.")
+            message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_GRAPHICS_CONTEXT_GL.")
         endif ()
         SET_AND_EXPOSE_TO_BUILD(USE_OPENGL TRUE)
@@ -315 +315 @@
 
     if (NOT EGL_FOUND AND (NOT ENABLE_X11_TARGET OR NOT GLX_FOUND))
-        message(FATAL_ERROR "Either GLX or EGL is needed for ENABLE_OPENGL.")
+        message(FATAL_ERROR "Either GLX or EGL is needed for ENABLE_GRAPHICS_CONTEXT_GL.")
     endif ()