Title: [274414] trunk/Source
Revision
274414
Author
commit-qu...@webkit.org
Date
2021-03-15 05:45:26 -0700 (Mon, 15 Mar 2021)

Log Message

Move vertex array functionality from ExtensionsGL to GraphicsContextGL
https://bugs.webkit.org/show_bug.cgi?id=221665

Patch by Kimmo Kinnunen <kkinnu...@apple.com> on 2021-03-15
Reviewed by Simon Fraser.

Source/WebCore:

There's no benefit in using ExtensionsGL, it is just adding bugs.
This commit is working towards removing ExtensionsGL.

The vertex array functionality already exists in GraphicsContextGL, use
it from there.

In WebGL1 case, the OES extension is used.

In WebGL2 case, all the functions end up calling the same functionality
underneath, regardless if client calls WebGL2 function or WebGL1
extension function.

ANGLE GenVertexArrays is the same function as GenVertexArraysOES except
GenVertexArrays is not enabled for ES 2.0 contexts.

No new tests, tested by WebGL conformance.

* html/canvas/OESVertexArrayObject.cpp:
(WebCore::OESVertexArrayObject::isVertexArrayOES):
(WebCore::OESVertexArrayObject::bindVertexArrayOES):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::getParameter):
* html/canvas/WebGLVertexArrayObjectOES.cpp:
(WebCore::WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES):
(WebCore::WebGLVertexArrayObjectOES::deleteObjectImpl):
* platform/graphics/ExtensionsGL.h:
* platform/graphics/GraphicsContextGL.h:
* platform/graphics/angle/ExtensionsGLANGLE.cpp:
* platform/graphics/angle/ExtensionsGLANGLE.h:
* platform/graphics/angle/GraphicsContextGLANGLE.cpp:
(WebCore::GraphicsContextGLOpenGL::createVertexArray):
(WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
(WebCore::GraphicsContextGLOpenGL::isVertexArray):
(WebCore::GraphicsContextGLOpenGL::bindVertexArray):
* platform/graphics/opengl/ExtensionsGLOpenGL.cpp:
(WebCore::ExtensionsGLOpenGL::createVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::deleteVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::isVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::bindVertexArrayOES):
* platform/graphics/opengl/ExtensionsGLOpenGLCommon.h:
* platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
(WebCore::GraphicsContextGLOpenGL::createVertexArray):
(WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
(WebCore::GraphicsContextGLOpenGL::isVertexArray):
(WebCore::GraphicsContextGLOpenGL::bindVertexArray):

Source/WebKit:

Generate WebGL GPUP implementation after the change.

* GPUProcess/graphics/RemoteGraphicsContextGL.messages.in:
* GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h:
(getGraphicsResetStatusARB):
* WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h:
* WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (274413 => 274414)


--- trunk/Source/WebCore/ChangeLog	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/ChangeLog	2021-03-15 12:45:26 UTC (rev 274414)
@@ -1,3 +1,56 @@
+2021-03-15  Kimmo Kinnunen  <kkinnu...@apple.com>
+
+        Move vertex array functionality from ExtensionsGL to GraphicsContextGL
+        https://bugs.webkit.org/show_bug.cgi?id=221665
+
+        Reviewed by Simon Fraser.
+
+        There's no benefit in using ExtensionsGL, it is just adding bugs.
+        This commit is working towards removing ExtensionsGL.
+
+        The vertex array functionality already exists in GraphicsContextGL, use
+        it from there.
+
+        In WebGL1 case, the OES extension is used.
+
+        In WebGL2 case, all the functions end up calling the same functionality
+        underneath, regardless if client calls WebGL2 function or WebGL1
+        extension function.
+
+        ANGLE GenVertexArrays is the same function as GenVertexArraysOES except
+        GenVertexArrays is not enabled for ES 2.0 contexts.
+
+        No new tests, tested by WebGL conformance.
+
+        * html/canvas/OESVertexArrayObject.cpp:
+        (WebCore::OESVertexArrayObject::isVertexArrayOES):
+        (WebCore::OESVertexArrayObject::bindVertexArrayOES):
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::getParameter):
+        * html/canvas/WebGLVertexArrayObjectOES.cpp:
+        (WebCore::WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES):
+        (WebCore::WebGLVertexArrayObjectOES::deleteObjectImpl):
+        * platform/graphics/ExtensionsGL.h:
+        * platform/graphics/GraphicsContextGL.h:
+        * platform/graphics/angle/ExtensionsGLANGLE.cpp:
+        * platform/graphics/angle/ExtensionsGLANGLE.h:
+        * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+        (WebCore::GraphicsContextGLOpenGL::createVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::isVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::bindVertexArray):
+        * platform/graphics/opengl/ExtensionsGLOpenGL.cpp:
+        (WebCore::ExtensionsGLOpenGL::createVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::deleteVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::isVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::bindVertexArrayOES):
+        * platform/graphics/opengl/ExtensionsGLOpenGLCommon.h:
+        * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
+        (WebCore::GraphicsContextGLOpenGL::createVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::isVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::bindVertexArray):
+
 2021-03-10  Sergio Villar Senin  <svil...@igalia.com>
 
         Do not shrink radio buttons bellow its size

Modified: trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp (274413 => 274414)


--- trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -80,7 +80,7 @@
         return false;
 
     return arrayObject && !m_context->isContextLost() && arrayObject->hasEverBeenBound()
-        && m_context->graphicsContextGL()->getExtensions().isVertexArrayOES(arrayObject->object());
+        && m_context->graphicsContextGL()->isVertexArray(arrayObject->object());
 }
 
 void OESVertexArrayObject::bindVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)
@@ -98,14 +98,14 @@
         return;
     }
 
-    auto& extensions = m_context->graphicsContextGL()->getExtensions();
+    auto* contextGL = m_context->graphicsContextGL();
     auto& context = downcast<WebGLRenderingContext>(*m_context);
     if (arrayObject && !arrayObject->isDefaultObject() && arrayObject->object()) {
-        extensions.bindVertexArrayOES(arrayObject->object());
+        contextGL->bindVertexArray(arrayObject->object());
         arrayObject->setHasEverBeenBound();
         context.setBoundVertexArrayObject(locker, arrayObject);
     } else {
-        extensions.bindVertexArrayOES(0);
+        contextGL->bindVertexArray(0);
         context.setBoundVertexArrayObject(locker, nullptr);
     }
 }

Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (274413 => 274414)


--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -3165,7 +3165,7 @@
         }
         synthesizeGLError(GraphicsContextGL::INVALID_ENUM, "getParameter", "invalid parameter name, WEBGL_debug_renderer_info not enabled");
         return nullptr;
-    case ExtensionsGL::VERTEX_ARRAY_BINDING_OES: // OES_vertex_array_object
+    case GraphicsContextGL::VERTEX_ARRAY_BINDING_OES: // OES_vertex_array_object
         if (m_oesVertexArrayObject) {
             if (m_boundVertexArrayObject->isDefaultObject())
                 return nullptr;

Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp (274413 => 274414)


--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -46,7 +46,7 @@
     case Type::Default:
         break;
     case Type::User:
-        setObject(this->context()->graphicsContextGL()->getExtensions().createVertexArrayOES());
+        setObject(this->context()->graphicsContextGL()->createVertexArray());
         break;
     }
 }
@@ -65,7 +65,7 @@
     case Type::Default:
         break;
     case Type::User:
-        context3d->getExtensions().deleteVertexArrayOES(object);
+        context3d->deleteVertexArray(object);
         break;
     }
 

Modified: trunk/Source/WebCore/platform/graphics/ExtensionsGL.h (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/ExtensionsGL.h	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/ExtensionsGL.h	2021-03-15 12:45:26 UTC (rev 274414)
@@ -281,12 +281,6 @@
     // externally.
     virtual GCGLint getGraphicsResetStatusARB() = 0;
 
-    // GL_OES_vertex_array_object
-    virtual PlatformGLObject createVertexArrayOES() = 0;
-    virtual void deleteVertexArrayOES(PlatformGLObject) = 0;
-    virtual GCGLboolean isVertexArrayOES(PlatformGLObject) = 0;
-    virtual void bindVertexArrayOES(PlatformGLObject) = 0;
-
     // GL_ANGLE_translated_shader_source
     virtual String getTranslatedShaderSourceANGLE(PlatformGLObject) = 0;
 

Modified: trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h	2021-03-15 12:45:26 UTC (rev 274414)
@@ -577,6 +577,7 @@
     static constexpr GCGLenum RG32I = 0x823B;
     static constexpr GCGLenum RG32UI = 0x823C;
     static constexpr GCGLenum VERTEX_ARRAY_BINDING = 0x85B5;
+    static constexpr GCGLenum VERTEX_ARRAY_BINDING_OES = 0x85B5;
     static constexpr GCGLenum R8_SNORM = 0x8F94;
     static constexpr GCGLenum RG8_SNORM = 0x8F95;
     static constexpr GCGLenum RGB8_SNORM = 0x8F96;

Modified: trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -107,46 +107,6 @@
     m_initializedAvailableExtensions = true;
 }
 
-PlatformGLObject ExtensionsGLANGLE::createVertexArrayOES()
-{
-    if (!m_context->makeContextCurrent())
-        return 0;
-
-    GLuint array = 0;
-    gl::GenVertexArraysOES(1, &array);
-    return array;
-}
-
-void ExtensionsGLANGLE::deleteVertexArrayOES(PlatformGLObject array)
-{
-    if (!array)
-        return;
-
-    if (!m_context->makeContextCurrent())
-        return;
-
-    gl::DeleteVertexArraysOES(1, &array);
-}
-
-GCGLboolean ExtensionsGLANGLE::isVertexArrayOES(PlatformGLObject array)
-{
-    if (!array)
-        return GL_FALSE;
-
-    if (!m_context->makeContextCurrent())
-        return GL_FALSE;
-
-    return gl::IsVertexArrayOES(array);
-}
-
-void ExtensionsGLANGLE::bindVertexArrayOES(PlatformGLObject array)
-{
-    if (!m_context->makeContextCurrent())
-        return;
-
-    gl::BindVertexArrayOES(array);
-}
-
 bool ExtensionsGLANGLE::supportsExtension(const String& name)
 {
     return m_availableExtensions.contains(name) || m_requestableExtensions.contains(name);

Modified: trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h	2021-03-15 12:45:26 UTC (rev 274414)
@@ -47,10 +47,6 @@
     bool isEnabled(const String&) override;
     GCGLint getGraphicsResetStatusARB() override;
 
-    PlatformGLObject createVertexArrayOES() override;
-    void deleteVertexArrayOES(PlatformGLObject) override;
-    GCGLboolean isVertexArrayOES(PlatformGLObject) override;
-    void bindVertexArrayOES(PlatformGLObject) override;
     void drawBuffersEXT(GCGLSpan<const GCGLenum>) override;
 
     String getTranslatedShaderSourceANGLE(PlatformGLObject) override;

Modified: trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -1711,7 +1711,10 @@
         return 0;
 
     GLuint array = 0;
-    gl::GenVertexArrays(1, &array);
+    if (m_isForWebGL2)
+        gl::GenVertexArrays(1, &array);
+    else
+        gl::GenVertexArraysOES(1, &array);
     return array;
 }
 
@@ -1721,8 +1724,10 @@
         return;
     if (!makeContextCurrent())
         return;
-
-    gl::DeleteVertexArrays(1, &array);
+    if (m_isForWebGL2)
+        gl::DeleteVertexArrays(1, &array);
+    else
+        gl::DeleteVertexArraysOES(1, &array);
 }
 
 GCGLboolean GraphicsContextGLOpenGL::isVertexArray(PlatformGLObject array)
@@ -1732,7 +1737,9 @@
     if (!makeContextCurrent())
         return GL_FALSE;
 
-    return gl::IsVertexArray(array);
+    if (m_isForWebGL2)
+        return gl::IsVertexArray(array);
+    return gl::IsVertexArrayOES(array);
 }
 
 void GraphicsContextGLOpenGL::bindVertexArray(PlatformGLObject array)
@@ -1739,8 +1746,10 @@
 {
     if (!makeContextCurrent())
         return;
-
-    gl::BindVertexArray(array);
+    if (m_isForWebGL2)
+        gl::BindVertexArray(array);
+    else
+        gl::BindVertexArrayOES(array);
 }
 
 void GraphicsContextGLOpenGL::getBooleanv(GCGLenum pname, GCGLSpan<GCGLboolean> value)

Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -57,8 +57,6 @@
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
         glGenVertexArrays(1, &array);
-#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
-    glGenVertexArraysAPPLE(1, &array);
 #endif
     return array;
 }
@@ -74,8 +72,6 @@
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
         glDeleteVertexArrays(1, &array);
-#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
-    glDeleteVertexArraysAPPLE(1, &array);
 #endif
 }
 
@@ -90,8 +86,6 @@
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
         return glIsVertexArray(array);
-#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
-    return glIsVertexArrayAPPLE(array);
 #endif
     return GL_FALSE;
 }
@@ -104,10 +98,6 @@
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
         glBindVertexArray(array);
-#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
-    glBindVertexArrayAPPLE(array);
-#else
-    UNUSED_PARAM(array);
 #endif
 }
 

Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h	2021-03-15 12:45:26 UTC (rev 274414)
@@ -46,10 +46,11 @@
     bool isEnabled(const String&) override;
     int getGraphicsResetStatusARB() override;
 
-    PlatformGLObject createVertexArrayOES() override = 0;
-    void deleteVertexArrayOES(PlatformGLObject) override = 0;
-    GCGLboolean isVertexArrayOES(PlatformGLObject) override = 0;
-    void bindVertexArrayOES(PlatformGLObject) override = 0;
+    // GL_OES_vertex_array_object
+    virtual PlatformGLObject createVertexArrayOES() = 0;
+    virtual void deleteVertexArrayOES(PlatformGLObject) = 0;
+    virtual GCGLboolean isVertexArrayOES(PlatformGLObject) = 0;
+    virtual void bindVertexArrayOES(PlatformGLObject) = 0;
 
     void drawBuffersEXT(GCGLSpan<const GCGLenum>) override = 0;
 

Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp (274413 => 274414)


--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -1591,53 +1591,22 @@
 
 PlatformGLObject GraphicsContextGLOpenGL::createVertexArray()
 {
-    if (!makeContextCurrent())
-        return 0;
-
-    GLuint array = 0;
-#if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
-    ::glGenVertexArrays(1, &array);
-#endif
-    return array;
+    return getExtensions().createVertexArrayOES();
 }
 
 void GraphicsContextGLOpenGL::deleteVertexArray(PlatformGLObject array)
 {
-    if (!array)
-        return;
-    
-    if (!makeContextCurrent())
-        return;
-
-#if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
-    ::glDeleteVertexArrays(1, &array);
-#endif
+    getExtensions().deleteVertexArrayOES(array);
 }
 
 GCGLboolean GraphicsContextGLOpenGL::isVertexArray(PlatformGLObject array)
 {
-    if (!array)
-        return GL_FALSE;
-    
-    if (!makeContextCurrent())
-        return GL_FALSE;
-
-#if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
-    return ::glIsVertexArray(array);
-#endif
-    return GL_FALSE;
+    return getExtensions().isVertexArrayOES(array);
 }
 
 void GraphicsContextGLOpenGL::bindVertexArray(PlatformGLObject array)
 {
-    if (!makeContextCurrent())
-        return;
-
-#if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
-    ::glBindVertexArray(array);
-#else
-    UNUSED_PARAM(array);
-#endif
+    getExtensions().bindVertexArrayOES(array);
 }
 
 void GraphicsContextGLOpenGL::getBooleanv(GCGLenum pname, GCGLSpan<GCGLboolean> value)

Modified: trunk/Source/WebKit/ChangeLog (274413 => 274414)


--- trunk/Source/WebKit/ChangeLog	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebKit/ChangeLog	2021-03-15 12:45:26 UTC (rev 274414)
@@ -1,5 +1,20 @@
 2021-03-15  Kimmo Kinnunen  <kkinnu...@apple.com>
 
+        Move vertex array functionality from ExtensionsGL to GraphicsContextGL
+        https://bugs.webkit.org/show_bug.cgi?id=221665
+
+        Reviewed by Simon Fraser.
+
+        Generate WebGL GPUP implementation after the change.
+
+        * GPUProcess/graphics/RemoteGraphicsContextGL.messages.in:
+        * GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h:
+        (getGraphicsResetStatusARB):
+        * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h:
+        * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
+
+2021-03-15  Kimmo Kinnunen  <kkinnu...@apple.com>
+
         RemoteRenderingBackend commands are not processed in order if GPU process is waiting for replies
         https://bugs.webkit.org/show_bug.cgi?id=222099
 

Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.messages.in (274413 => 274414)


--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.messages.in	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.messages.in	2021-03-15 12:45:26 UTC (rev 274414)
@@ -277,10 +277,6 @@
     void UniformBlockBinding(uint32_t program, uint32_t uniformBlockIndex, uint32_t uniformBlockBinding)
     void GetActiveUniformBlockiv(uint32_t program, uint32_t uniformBlockIndex, uint32_t pname, uint64_t paramsSize) -> (IPC::ArrayReference<int32_t> params) Synchronous
     void GetGraphicsResetStatusARB() -> (int32_t returnValue) Synchronous
-    void CreateVertexArrayOES() -> (uint32_t returnValue) Synchronous
-    void DeleteVertexArrayOES(uint32_t arg0)
-    void IsVertexArrayOES(uint32_t arg0) -> (bool returnValue) Synchronous
-    void BindVertexArrayOES(uint32_t arg0)
     void GetTranslatedShaderSourceANGLE(uint32_t arg0) -> (String returnValue) Synchronous
     void DrawBuffersEXT(IPC::ArrayReference<uint32_t> bufs)
     void DrawArraysInstancedANGLE(uint32_t mode, int32_t first, int32_t count, int32_t primcount)

Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h (274413 => 274414)


--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h	2021-03-15 12:45:26 UTC (rev 274414)
@@ -1104,26 +1104,6 @@
         returnValue = m_context->getExtensions().getGraphicsResetStatusARB();
         completionHandler(returnValue);
     }
-    void createVertexArrayOES(CompletionHandler<void(uint32_t)>&& completionHandler)
-    {
-        PlatformGLObject returnValue = { };
-        returnValue = m_context->getExtensions().createVertexArrayOES();
-        completionHandler(returnValue);
-    }
-    void deleteVertexArrayOES(uint32_t arg0)
-    {
-        m_context->getExtensions().deleteVertexArrayOES(arg0);
-    }
-    void isVertexArrayOES(uint32_t arg0, CompletionHandler<void(bool)>&& completionHandler)
-    {
-        GCGLboolean returnValue = { };
-        returnValue = m_context->getExtensions().isVertexArrayOES(arg0);
-        completionHandler(static_cast<bool>(returnValue));
-    }
-    void bindVertexArrayOES(uint32_t arg0)
-    {
-        m_context->getExtensions().bindVertexArrayOES(arg0);
-    }
     void getTranslatedShaderSourceANGLE(uint32_t arg0, CompletionHandler<void(String&&)>&& completionHandler)
     {
         String returnValue = { };

Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h (274413 => 274414)


--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h	2021-03-15 12:45:26 UTC (rev 274414)
@@ -308,10 +308,6 @@
     void uniformBlockBinding(PlatformGLObject program, GCGLuint uniformBlockIndex, GCGLuint uniformBlockBinding) final;
     void getActiveUniformBlockiv(GCGLuint program, GCGLuint uniformBlockIndex, GCGLenum pname, GCGLSpan<GCGLint> params) final;
     GCGLint getGraphicsResetStatusARB() final;
-    PlatformGLObject createVertexArrayOES() final;
-    void deleteVertexArrayOES(PlatformGLObject arg0) final;
-    GCGLboolean isVertexArrayOES(PlatformGLObject arg0) final;
-    void bindVertexArrayOES(PlatformGLObject arg0) final;
     String getTranslatedShaderSourceANGLE(PlatformGLObject arg0) final;
     void drawBuffersEXT(GCGLSpan<const GCGLenum> bufs) final;
     void drawArraysInstancedANGLE(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount) final;

Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp (274413 => 274414)


--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp	2021-03-15 11:34:01 UTC (rev 274413)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp	2021-03-15 12:45:26 UTC (rev 274414)
@@ -2298,46 +2298,6 @@
     return returnValue;
 }
 
-PlatformGLObject RemoteGraphicsContextGLProxy::createVertexArrayOES()
-{
-    uint32_t returnValue = { };
-    if (!isContextLost()) {
-        auto sendResult = sendSync(Messages::RemoteGraphicsContextGL::CreateVertexArrayOES(), Messages::RemoteGraphicsContextGL::CreateVertexArrayOES::Reply(returnValue));
-        if (!sendResult)
-            markContextLost();
-    }
-    return returnValue;
-}
-
-void RemoteGraphicsContextGLProxy::deleteVertexArrayOES(PlatformGLObject arg0)
-{
-    if (!isContextLost()) {
-        auto sendResult = send(Messages::RemoteGraphicsContextGL::DeleteVertexArrayOES(arg0));
-        if (!sendResult)
-            markContextLost();
-    }
-}
-
-GCGLboolean RemoteGraphicsContextGLProxy::isVertexArrayOES(PlatformGLObject arg0)
-{
-    bool returnValue = { };
-    if (!isContextLost()) {
-        auto sendResult = sendSync(Messages::RemoteGraphicsContextGL::IsVertexArrayOES(arg0), Messages::RemoteGraphicsContextGL::IsVertexArrayOES::Reply(returnValue));
-        if (!sendResult)
-            markContextLost();
-    }
-    return static_cast<GCGLboolean>(returnValue);
-}
-
-void RemoteGraphicsContextGLProxy::bindVertexArrayOES(PlatformGLObject arg0)
-{
-    if (!isContextLost()) {
-        auto sendResult = send(Messages::RemoteGraphicsContextGL::BindVertexArrayOES(arg0));
-        if (!sendResult)
-            markContextLost();
-    }
-}
-
 String RemoteGraphicsContextGLProxy::getTranslatedShaderSourceANGLE(PlatformGLObject arg0)
 {
     String returnValue = { };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to