Changeset 287983 in webkit

Timestamp:

Jan 13, 2022, 11:03:25 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][WPE][WebGL2] compilation fixes
​https://bugs.webkit.org/show_bug.cgi?id=225563

Patch by Alejandro G. Castro <​alex@igalia.com> 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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (2 diffs)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2022-01-13  Alejandro G. Castro  <alex@igalia.com>
+
+        [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  <clord@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-13  Alejandro G. Castro  <alex@igalia.com>
+
+        [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  <said@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -2817 +2817 @@
     if (!isGLES2NPOTStrict())
         usesFallbackTexture = checkTextureCompleteness("drawElements", true);
-#endif
-
-#if USE(OPENGL) && ENABLE(WEBGL2)
-    if (isWebGL2())
-        m_context->primitiveRestartIndex(getRestartIndex(type));
 #endif
 
@@ -8031 +8026 @@
 #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);
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -84 +84 @@
 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)

trunk/Source/cmake/OptionsWPE.cmake

@@ -67 +67 @@
 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})
@@ -89 +88 @@
 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")