Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gcGLSpanDynamicExtent is defined in incorrect header, GCGLSpan.h included in wrong order #12611

Merged
merged 1 commit into from
Apr 12, 2023

Commits on Apr 12, 2023

  1. gcGLSpanDynamicExtent is defined in incorrect header, GCGLSpan.h incl…

    …uded in wrong order
    
    https://bugs.webkit.org/show_bug.cgi?id=253887
    rdar://106701929
    
    Reviewed by Antti Koivisto.
    
    Fix by removing the GCGLSpan, and use Span instead.
    Replaces GCGLSpan<GCGLvoid> with Span<uint8_t>.
    
    Reduces duplication.
    
    Allows future improvements by using Span in the source APIs providing
    the data pointer, length pairs. This is not feasible otherwise, as
    GCGLSpan was a bit unworkable to be returned by arbitrary interface.
    
    * Source/WebCore/Modules/webxr/WebXROpaqueFramebuffer.cpp:
    (WebCore::WebXROpaqueFramebuffer::startFrame):
    (WebCore::WebXROpaqueFramebuffer::endFrame):
    (WebCore::WebXROpaqueFramebuffer::setupFramebuffer):
    * Source/WebCore/html/canvas/WebGL2RenderingContext.cpp:
    (WebCore::WebGL2RenderingContext::getBufferSubData):
    (WebCore::WebGL2RenderingContext::compressedTexImage2D):
    (WebCore::WebGL2RenderingContext::compressedTexImage3D):
    (WebCore::WebGL2RenderingContext::compressedTexSubImage2D):
    (WebCore::WebGL2RenderingContext::compressedTexSubImage3D):
    (WebCore::WebGL2RenderingContext::vertexAttribI4iv):
    (WebCore::WebGL2RenderingContext::vertexAttribI4uiv):
    (WebCore::WebGL2RenderingContext::validateClearBuffer):
    * Source/WebCore/html/canvas/WebGL2RenderingContext.h:
    * Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp:
    (WebCore::WebGLRenderingContextBase::bufferData):
    (WebCore::WebGLRenderingContextBase::bufferSubData):
    (WebCore::WebGLRenderingContextBase::compressedTexImage2D):
    (WebCore::WebGLRenderingContextBase::compressedTexSubImage2D):
    (WebCore::WebGLRenderingContextBase::getUniform):
    (WebCore::WebGLRenderingContextBase::readPixels):
    (WebCore::WebGLRenderingContextBase::texImageSource):
    (WebCore::WebGLRenderingContextBase::texImageImpl):
    (WebCore::WebGLRenderingContextBase::texImage2DBase):
    (WebCore::WebGLRenderingContextBase::texSubImage2DBase):
    (WebCore::WebGLRenderingContextBase::validateTexFuncData):
    (WebCore::WebGLRenderingContextBase::validateUniformMatrixParameters):
    (WebCore::WebGLRenderingContextBase::vertexAttribfvImpl):
    * Source/WebCore/html/canvas/WebGLRenderingContextBase.h:
    (WebCore::WebGLRenderingContextBase::validateUniformParameters):
    * Source/WebCore/platform/graphics/GCGLSpan.h:
    (GCGLSpan::GCGLSpan): Deleted.
    (GCGLSpan::operator[]): Deleted.
    (GCGLSpan::operator*): Deleted.
    (GCGLSpan<GCGLvoid>::GCGLSpan): Deleted.
    (makeGCGLSpan): Deleted.
    * Source/WebCore/platform/graphics/GraphicsContextGL.cpp:
    (WebCore::GraphicsContextGL::extractTextureData):
    * Source/WebCore/platform/graphics/GraphicsContextGL.h:
    * Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp:
    (WebCore::GraphicsContextGLANGLE::getIntegerv):
    (WebCore::GraphicsContextGLANGLE::getIntegeri_v):
    (WebCore::GraphicsContextGLANGLE::getShaderPrecisionFormat):
    (WebCore::GraphicsContextGLANGLE::texImage2D):
    (WebCore::GraphicsContextGLANGLE::texSubImage2D):
    (WebCore::GraphicsContextGLANGLE::compressedTexImage2D):
    (WebCore::GraphicsContextGLANGLE::compressedTexSubImage2D):
    (WebCore::GraphicsContextGLANGLE::readnPixels):
    (WebCore::GraphicsContextGLANGLE::readnPixelsWithStatus):
    (WebCore::GraphicsContextGLANGLE::readnPixelsImpl):
    (WebCore::GraphicsContextGLANGLE::bufferData):
    (WebCore::GraphicsContextGLANGLE::bufferSubData):
    (WebCore::GraphicsContextGLANGLE::getBufferSubData):
    (WebCore::GraphicsContextGLANGLE::getInternalformativ):
    (WebCore::GraphicsContextGLANGLE::texImage3D):
    (WebCore::GraphicsContextGLANGLE::texSubImage3D):
    (WebCore::GraphicsContextGLANGLE::compressedTexImage3D):
    (WebCore::GraphicsContextGLANGLE::compressedTexSubImage3D):
    (WebCore::GraphicsContextGLANGLE::uniform1fv):
    (WebCore::GraphicsContextGLANGLE::uniform2fv):
    (WebCore::GraphicsContextGLANGLE::uniform3fv):
    (WebCore::GraphicsContextGLANGLE::uniform4fv):
    (WebCore::GraphicsContextGLANGLE::uniform1iv):
    (WebCore::GraphicsContextGLANGLE::uniform2iv):
    (WebCore::GraphicsContextGLANGLE::uniform3iv):
    (WebCore::GraphicsContextGLANGLE::uniform4iv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix2fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix3fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix4fv):
    (WebCore::GraphicsContextGLANGLE::vertexAttrib1fv):
    (WebCore::GraphicsContextGLANGLE::vertexAttrib2fv):
    (WebCore::GraphicsContextGLANGLE::vertexAttrib3fv):
    (WebCore::GraphicsContextGLANGLE::vertexAttrib4fv):
    (WebCore::GraphicsContextGLANGLE::getBooleanv):
    (WebCore::GraphicsContextGLANGLE::getFloatv):
    (WebCore::GraphicsContextGLANGLE::getUniformfv):
    (WebCore::GraphicsContextGLANGLE::getUniformiv):
    (WebCore::GraphicsContextGLANGLE::getUniformuiv):
    (WebCore::GraphicsContextGLANGLE::invalidateFramebuffer):
    (WebCore::GraphicsContextGLANGLE::invalidateSubFramebuffer):
    (WebCore::GraphicsContextGLANGLE::uniform1uiv):
    (WebCore::GraphicsContextGLANGLE::uniform2uiv):
    (WebCore::GraphicsContextGLANGLE::uniform3uiv):
    (WebCore::GraphicsContextGLANGLE::uniform4uiv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix2x3fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix3x2fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix2x4fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix4x2fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix3x4fv):
    (WebCore::GraphicsContextGLANGLE::uniformMatrix4x3fv):
    (WebCore::GraphicsContextGLANGLE::vertexAttribI4iv):
    (WebCore::GraphicsContextGLANGLE::vertexAttribI4uiv):
    (WebCore::GraphicsContextGLANGLE::drawBuffers):
    (WebCore::GraphicsContextGLANGLE::clearBufferiv):
    (WebCore::GraphicsContextGLANGLE::clearBufferuiv):
    (WebCore::GraphicsContextGLANGLE::clearBufferfv):
    (WebCore::GraphicsContextGLANGLE::getActiveUniformBlockiv):
    (WebCore::GraphicsContextGLANGLE::drawBuffersEXT):
    * Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h:
    * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp:
    (WebKit::RemoteGraphicsContextGL::readnPixels2):
    * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h:
    (uniform1fv):
    (uniform1iv):
    (uniform2fv):
    (uniform2iv):
    (uniform3fv):
    (uniform3iv):
    (uniform4fv):
    (uniform4iv):
    (uniformMatrix2fv):
    (uniformMatrix3fv):
    (uniformMatrix4fv):
    (vertexAttrib1fv):
    (vertexAttrib2fv):
    (vertexAttrib3fv):
    (vertexAttrib4fv):
    (bufferData1):
    (bufferSubData):
    (texImage2D0):
    (texSubImage2D0):
    (compressedTexImage2D0):
    (compressedTexSubImage2D0):
    (getBufferSubData):
    (invalidateFramebuffer):
    (invalidateSubFramebuffer):
    (texImage3D0):
    (texSubImage3D0):
    (compressedTexImage3D0):
    (compressedTexSubImage3D0):
    (uniform1uiv):
    (uniform2uiv):
    (uniform3uiv):
    (uniform4uiv):
    (uniformMatrix2x3fv):
    (uniformMatrix3x2fv):
    (uniformMatrix2x4fv):
    (uniformMatrix4x2fv):
    (uniformMatrix3x4fv):
    (uniformMatrix4x3fv):
    (vertexAttribI4iv):
    (vertexAttribI4uiv):
    (drawBuffers):
    (clearBufferiv):
    (clearBufferuiv):
    (clearBufferfv):
    (drawBuffersEXT):
    * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp:
    (WebKit::RemoteGraphicsContextGLProxy::readnPixels):
    (WebKit::RemoteGraphicsContextGLProxy::readnPixelsSharedMemory):
    * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h:
    * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
    (WebKit::RemoteGraphicsContextGLProxy::getFloatv):
    (WebKit::RemoteGraphicsContextGLProxy::getIntegerv):
    (WebKit::RemoteGraphicsContextGLProxy::getIntegeri_v):
    (WebKit::RemoteGraphicsContextGLProxy::getBooleanv):
    (WebKit::RemoteGraphicsContextGLProxy::getShaderPrecisionFormat):
    (WebKit::RemoteGraphicsContextGLProxy::getUniformfv):
    (WebKit::RemoteGraphicsContextGLProxy::getUniformiv):
    (WebKit::RemoteGraphicsContextGLProxy::getUniformuiv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform1fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform1iv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform2fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform2iv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform3fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform3iv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform4fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform4iv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix2fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix3fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix4fv):
    (WebKit::RemoteGraphicsContextGLProxy::vertexAttrib1fv):
    (WebKit::RemoteGraphicsContextGLProxy::vertexAttrib2fv):
    (WebKit::RemoteGraphicsContextGLProxy::vertexAttrib3fv):
    (WebKit::RemoteGraphicsContextGLProxy::vertexAttrib4fv):
    (WebKit::RemoteGraphicsContextGLProxy::bufferData):
    (WebKit::RemoteGraphicsContextGLProxy::bufferSubData):
    (WebKit::RemoteGraphicsContextGLProxy::texImage2D):
    (WebKit::RemoteGraphicsContextGLProxy::texSubImage2D):
    (WebKit::RemoteGraphicsContextGLProxy::compressedTexImage2D):
    (WebKit::RemoteGraphicsContextGLProxy::compressedTexSubImage2D):
    (WebKit::RemoteGraphicsContextGLProxy::getBufferSubData):
    (WebKit::RemoteGraphicsContextGLProxy::invalidateFramebuffer):
    (WebKit::RemoteGraphicsContextGLProxy::invalidateSubFramebuffer):
    (WebKit::RemoteGraphicsContextGLProxy::texImage3D):
    (WebKit::RemoteGraphicsContextGLProxy::texSubImage3D):
    (WebKit::RemoteGraphicsContextGLProxy::compressedTexImage3D):
    (WebKit::RemoteGraphicsContextGLProxy::compressedTexSubImage3D):
    (WebKit::RemoteGraphicsContextGLProxy::uniform1uiv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform2uiv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform3uiv):
    (WebKit::RemoteGraphicsContextGLProxy::uniform4uiv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix2x3fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix3x2fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix2x4fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix4x2fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix3x4fv):
    (WebKit::RemoteGraphicsContextGLProxy::uniformMatrix4x3fv):
    (WebKit::RemoteGraphicsContextGLProxy::vertexAttribI4iv):
    (WebKit::RemoteGraphicsContextGLProxy::vertexAttribI4uiv):
    (WebKit::RemoteGraphicsContextGLProxy::drawBuffers):
    (WebKit::RemoteGraphicsContextGLProxy::clearBufferiv):
    (WebKit::RemoteGraphicsContextGLProxy::clearBufferuiv):
    (WebKit::RemoteGraphicsContextGLProxy::clearBufferfv):
    (WebKit::RemoteGraphicsContextGLProxy::getActiveUniformBlockiv):
    (WebKit::RemoteGraphicsContextGLProxy::drawBuffersEXT):
    (WebKit::RemoteGraphicsContextGLProxy::getInternalformativ):
    * Tools/Scripts/generate-gpup-webgl:
    
    Canonical link: https://commits.webkit.org/262866@main
    kkinnunen-apple committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    97ca174 View commit details
    Browse the repository at this point in the history