Title: [287983] trunk
- Revision
- 287983
- Author
- [email protected]
- Date
- 2022-01-13 11:03:25 -0800 (Thu, 13 Jan 2022)
Log Message
[GTK][WPE][WebGL2] compilation fixes
https://bugs.webkit.org/show_bug.cgi?id=225563
Patch by Alejandro G. Castro <[email protected]> on 2022-01-13
Reviewed by Chris Lord.
Fix the compilation and add the ANGLE dependency, the architecture
is still not the final one but it is handy to use WebGL2 demos for
testing already.
.:
* Source/cmake/OptionsGTK.cmake: Added dependency with ANGLE.
* Source/cmake/OptionsWPE.cmake: Added dependency with
ANGLE. Remove the default ENABLE_WEBGL2 because it is the same
default value in WebKitFeatures.cmake.
Source/WebCore:
We are still not enabling the tests until we have the final
architecture.
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::drawElements): Leftover code,
there is no port using OpenGL directly to support WebGL2 anymore.
(WebCore::WebGLRenderingContextBase::drawElementsInstanced):
Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (287982 => 287983)
--- trunk/ChangeLog 2022-01-13 18:58:47 UTC (rev 287982)
+++ trunk/ChangeLog 2022-01-13 19:03:25 UTC (rev 287983)
@@ -1,3 +1,19 @@
+2022-01-13 Alejandro G. Castro <[email protected]>
+
+ [GTK][WPE][WebGL2] compilation fixes
+ https://bugs.webkit.org/show_bug.cgi?id=225563
+
+ Reviewed by Chris Lord.
+
+ Fix the compilation and add the ANGLE dependency, the architecture
+ is still not the final one but it is handy to use WebGL2 demos for
+ testing already.
+
+ * Source/cmake/OptionsGTK.cmake: Added dependency with ANGLE.
+ * Source/cmake/OptionsWPE.cmake: Added dependency with
+ ANGLE. Remove the default ENABLE_WEBGL2 because it is the same
+ default value in WebKitFeatures.cmake.
+
2022-01-12 Chris Lord <[email protected]>
[WPE] Fix building WebXR with ANGLE enabled
Modified: trunk/Source/WebCore/ChangeLog (287982 => 287983)
--- trunk/Source/WebCore/ChangeLog 2022-01-13 18:58:47 UTC (rev 287982)
+++ trunk/Source/WebCore/ChangeLog 2022-01-13 19:03:25 UTC (rev 287983)
@@ -1,3 +1,23 @@
+2022-01-13 Alejandro G. Castro <[email protected]>
+
+ [GTK][WPE][WebGL2] compilation fixes
+ https://bugs.webkit.org/show_bug.cgi?id=225563
+
+ Reviewed by Chris Lord.
+
+ Fix the compilation and add the ANGLE dependency, the architecture
+ is still not the final one but it is handy to use WebGL2 demos for
+ testing already.
+
+ We are still not enabling the tests until we have the final
+ architecture.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::drawElements): Leftover code,
+ there is no port using OpenGL directly to support WebGL2 anymore.
+ (WebCore::WebGLRenderingContextBase::drawElementsInstanced):
+ Ditto.
+
2022-01-13 Said Abou-Hallawa <[email protected]>
Referenced SVG filter uses always sRGB color space for its result
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (287982 => 287983)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2022-01-13 18:58:47 UTC (rev 287982)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2022-01-13 19:03:25 UTC (rev 287983)
@@ -2818,11 +2818,6 @@
usesFallbackTexture = checkTextureCompleteness("drawElements", true);
#endif
-#if USE(OPENGL) && ENABLE(WEBGL2)
- if (isWebGL2())
- m_context->primitiveRestartIndex(getRestartIndex(type));
-#endif
-
{
InspectorScopedShaderProgramHighlight scopedHighlight(*this, m_currentProgram.get());
@@ -8030,11 +8025,6 @@
checkTextureCompleteness("drawElementsInstanced", true);
#endif
-#if USE(OPENGL) && ENABLE(WEBGL2)
- if (isWebGL2())
- static_cast<GraphicsContextGLOpenGL*>(m_context.get())->primitiveRestartIndex(getRestartIndex(type));
-#endif
-
m_context->drawElementsInstanced(mode, count, type, static_cast<GCGLintptr>(offset), primcount);
#if !USE(ANGLE)
Modified: trunk/Source/cmake/OptionsGTK.cmake (287982 => 287983)
--- trunk/Source/cmake/OptionsGTK.cmake 2022-01-13 18:58:47 UTC (rev 287982)
+++ trunk/Source/cmake/OptionsGTK.cmake 2022-01-13 19:03:25 UTC (rev 287983)
@@ -83,6 +83,7 @@
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(ENABLE_WEBGL2 USE_ANGLE_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)
Modified: trunk/Source/cmake/OptionsWPE.cmake (287982 => 287983)
--- trunk/Source/cmake/OptionsWPE.cmake 2022-01-13 18:58:47 UTC (rev 287982)
+++ trunk/Source/cmake/OptionsWPE.cmake 2022-01-13 19:03:25 UTC (rev 287983)
@@ -66,7 +66,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBXR PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
@@ -88,6 +87,7 @@
WEBKIT_OPTION_DEFINE(USE_EXTERNAL_HOLEPUNCH "Whether to enable external holepunch" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL)
+WEBKIT_OPTION_DEPEND(ENABLE_WEBGL2 USE_ANGLE_WEBGL)
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
