Changeset 287984 in webkit

Timestamp:

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

Author:

commit-queue@webkit.org

Message:

Remove the code inside USE(OPENGL) && ENABLE(WEBGL2)
​https://bugs.webkit.org/show_bug.cgi?id=235178

Patch by Alejandro G. Castro <​alex@igalia.com> on 2022-01-13
Reviewed by Dean Jackson.

No port is supporting WebGL2 without ANGLE nowadays, that code is
historical and we can remove it.

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::getRestartIndex): Deleted.

• platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:

(WebCore::GraphicsContextGLOpenGL::primitiveRestartIndex): Deleted.

• platform/graphics/opengl/GraphicsContextGLOpenGL.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContextBase.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContextGLOpenGL.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContextGLOpenGL.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-13  Alejandro G. Castro  <alex@igalia.com>
+
+        Remove the code inside USE(OPENGL) && ENABLE(WEBGL2)
+        https://bugs.webkit.org/show_bug.cgi?id=235178
+
+        Reviewed by Dean Jackson.
+
+        No port is supporting WebGL2 without ANGLE nowadays, that code is
+        historical and we can remove it.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::getRestartIndex): Deleted.
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:
+        (WebCore::GraphicsContextGLOpenGL::primitiveRestartIndex): Deleted.
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+
 2022-01-13  Alejandro G. Castro  <alex@igalia.com>
 

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

@@ -2766 +2766 @@
     markContextChangedAndNotifyCanvasObserver();
 }
-
-#if USE(OPENGL) && ENABLE(WEBGL2)
-static GCGLuint getRestartIndex(GCGLenum type)
-{
-    switch (type) {
-    case GraphicsContextGL::UNSIGNED_BYTE:
-        return std::numeric_limits<GCGLubyte>::max();
-    case GraphicsContextGL::UNSIGNED_SHORT:
-        return std::numeric_limits<GCGLushort>::max();
-    case GraphicsContextGL::UNSIGNED_INT:
-        return std::numeric_limits<GCGLuint>::max();
-    }
-
-    return 0;
-}
-#endif
 
 void WebGLRenderingContextBase::drawElements(GCGLenum mode, GCGLsizei count, GCGLenum type, long long offset)

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp

@@ -2384 +2384 @@
 }
 
-#if HAVE(OPENGL_4) && ENABLE(WEBGL2)
-void GraphicsContextGLOpenGL::primitiveRestartIndex(GCGLuint index)
-{
-    if (!makeContextCurrent())
-        return;
-
-    ::glPrimitiveRestartIndex(index);
-}
-#endif
-
 void GraphicsContextGLOpenGL::bufferData(GCGLenum target, const void* data, GCGLenum usage, GCGLuint srcOffset, GCGLuint length)
 {

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h

@@ -384 +384 @@
     std::optional<PixelBuffer> readCompositedResultsForPainting();
 
-#if USE(OPENGL) && ENABLE(WEBGL2)
-    void primitiveRestartIndex(GCGLuint);
-#endif
-
-
     void setContextVisibility(bool) final;