Title: [271220] trunk
- Revision
- 271220
- Author
- [email protected]
- Date
- 2021-01-06 16:49:55 -0800 (Wed, 06 Jan 2021)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (271219 => 271220)
--- trunk/ChangeLog 2021-01-07 00:16:30 UTC (rev 271219)
+++ trunk/ChangeLog 2021-01-07 00:49:55 UTC (rev 271220)
@@ -1,3 +1,17 @@
+2021-01-06 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
[WinCairo][curl] Enable CURLSSLOPT_NATIVE_CA flag to use system's CA certs instead of cacert.pem
Modified: trunk/Source/WebCore/ChangeLog (271219 => 271220)
--- trunk/Source/WebCore/ChangeLog 2021-01-07 00:16:30 UTC (rev 271219)
+++ trunk/Source/WebCore/ChangeLog 2021-01-07 00:49:55 UTC (rev 271220)
@@ -1,3 +1,12 @@
+2021-01-06 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
[Cocoa] Revert audioTimePitchAlgorithm to "TimeDomain" from "Spectral"
Modified: trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (271219 => 271220)
--- trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2021-01-07 00:16:30 UTC (rev 271219)
+++ trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2021-01-07 00:49:55 UTC (rev 271220)
@@ -32,6 +32,7 @@
#include <X11/Xlib.h>
#include <X11/extensions/Xcomposite.h>
#if PLATFORM(GTK)
+#include <X11/Xutil.h>
#include <X11/extensions/Xdamage.h>
#endif
Modified: trunk/Source/cmake/OptionsGTK.cmake (271219 => 271220)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-01-07 00:16:30 UTC (rev 271219)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-01-07 00:49:55 UTC (rev 271220)
@@ -72,17 +72,18 @@
add_definitions(-DENABLE_OPENTYPE_MATH=1)
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 ()
+
# Public options specific to the GTK port. Do not add any options here unless
# there is a strong reason we should support changing the value of the option,
# and the option is not relevant to any other WebKit ports.
@@ -95,6 +96,7 @@
WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
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)
WEBKIT_OPTION_DEFINE(USE_WPE_RENDERER "Whether to enable WPE rendering" PUBLIC ON)
@@ -104,7 +106,13 @@
# completely unsupported. They are intended for use only by WebKit developers.
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)
SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
@@ -266,7 +274,7 @@
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)
find_package(OpenGLES2 REQUIRED)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
