Diff
Modified: trunk/Source/WebCore/ChangeLog (272216 => 272217)
--- trunk/Source/WebCore/ChangeLog 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/ChangeLog 2021-02-02 18:10:39 UTC (rev 272217)
@@ -1,3 +1,143 @@
+2021-02-02 Rini Patel <[email protected]>
+
+ Remove unused functions from GraphicsContextGL and ExtensionsGL
+ https://bugs.webkit.org/show_bug.cgi?id=218896
+
+ Reviewed by Dean Jackson.
+
+ Remove unused functions from GraphicsContextGL and ExtensionsGL
+ They're dead code and make it harder to implement the GPU Process version.
+
+ - If the function is unused, remove it fully
+ - If the function is unused in USE(ANGLE) WebGL part, remove the function from GraphicsContextGL and ANGLE GraphicsContextGLOpenGL
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::create):
+ * platform/graphics/ExtensionsGL.h:
+ * platform/graphics/RemoteGraphicsContextGLProxyBase.cpp:
+ (WebCore::RemoteGraphicsContextGLProxyBase::getnUniformivEXT):
+ (WebCore::RemoteGraphicsContextGLProxyBase::isNVIDIA): Deleted.
+ (WebCore::RemoteGraphicsContextGLProxyBase::isAMD): Deleted.
+ (WebCore::RemoteGraphicsContextGLProxyBase::isIntel): Deleted.
+ (WebCore::RemoteGraphicsContextGLProxyBase::isImagination): Deleted.
+ (WebCore::RemoteGraphicsContextGLProxyBase::vendor): Deleted.
+ (WebCore::RemoteGraphicsContextGLProxyBase::requiresBuiltInFunctionEmulation): Deleted.
+ (WebCore::RemoteGraphicsContextGLProxyBase::requiresRestrictedMaximumTextureSize): Deleted.
+ * platform/graphics/RemoteGraphicsContextGLProxyBase.h:
+ * platform/graphics/angle/ExtensionsGLANGLE.cpp:
+ (WebCore::ExtensionsGLANGLE::ExtensionsGLANGLE):
+ (WebCore::ExtensionsGLANGLE::initializeAvailableExtensions):
+ (WebCore::ExtensionsGLANGLE::blitFramebufferANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::renderbufferStorageMultisampleANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::insertEventMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLANGLE::pushGroupMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLANGLE::popGroupMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLANGLE::readPixelsRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::texParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::texParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getQueryivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getQueryObjectuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getBufferPointervRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getVertexAttribIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getVertexAttribIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getUniformuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::samplerParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::samplerParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getSamplerParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getSamplerParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getFramebufferParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getProgramInterfaceivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getBooleani_vRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getMultisamplefvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getTexLevelParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getTexLevelParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getPointervRobustANGLERobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getnUniformfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getnUniformivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getnUniformuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::texParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::texParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getTexParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getTexParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::samplerParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::samplerParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getSamplerParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getSamplerParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getQueryObjectivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE): Deleted.
+ * platform/graphics/angle/ExtensionsGLANGLE.h:
+ * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+ (WebCore::GraphicsContextGLOpenGL::markLayerComposited):
+ * platform/graphics/opengl/ExtensionsGLOpenGL.cpp:
+ (WebCore::ExtensionsGLOpenGL::blitFramebufferANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGL::renderbufferStorageMultisampleANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGL::insertEventMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLOpenGL::pushGroupMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLOpenGL::popGroupMarkerEXT): Deleted.
+ * platform/graphics/opengl/ExtensionsGLOpenGL.h:
+ * platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp:
+ (WebCore::ExtensionsGLOpenGLCommon::readPixelsRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::texParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::texParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getQueryivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getQueryObjectuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getBufferPointervRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getVertexAttribIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getVertexAttribIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getUniformuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getBufferParameteri64vRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::samplerParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::samplerParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getSamplerParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getSamplerParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getFramebufferParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getProgramInterfaceivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getBooleani_vRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getMultisamplefvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getTexLevelParameterivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getTexLevelParameterfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getPointervRobustANGLERobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getnUniformfvRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getnUniformivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getnUniformuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::texParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::texParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getTexParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getTexParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::samplerParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::samplerParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getSamplerParameterIivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getSamplerParameterIuivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getQueryObjectivRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getQueryObjecti64vRobustANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLCommon::getQueryObjectui64vRobustANGLE): Deleted.
+ * platform/graphics/opengl/ExtensionsGLOpenGLCommon.h:
+ (WebCore::ExtensionsGLOpenGLCommon::isNVIDIA const):
+ (WebCore::ExtensionsGLOpenGLCommon::isAMD const):
+ (WebCore::ExtensionsGLOpenGLCommon::isIntel const):
+ (WebCore::ExtensionsGLOpenGLCommon::isImagination const):
+ (WebCore::ExtensionsGLOpenGLCommon::vendor const):
+ (WebCore::ExtensionsGLOpenGLCommon::requiresBuiltInFunctionEmulation const):
+ (WebCore::ExtensionsGLOpenGLCommon::requiresRestrictedMaximumTextureSize const):
+ * platform/graphics/opengl/ExtensionsGLOpenGLES.cpp:
+ (WebCore::ExtensionsGLOpenGLES::blitFramebufferANGLE): Deleted.
+ (WebCore::ExtensionsGLOpenGLES::insertEventMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLOpenGLES::pushGroupMarkerEXT): Deleted.
+ (WebCore::ExtensionsGLOpenGLES::popGroupMarkerEXT): Deleted.
+ * platform/graphics/opengl/ExtensionsGLOpenGLES.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
+ (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+ (WebCore::GraphicsContextGLOpenGL::getExtensions):
+ * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
+ (WebCore::GraphicsContextGLOpenGL::validateDepthStencil):
+ * platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
+ (WebCore::GraphicsContextGLOpenGL::getExtensions):
+ * platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
+ (WebCore::GraphicsContextGLOpenGL::getExtensions):
+
2021-02-02 Yusuke Suzuki <[email protected]>
Support BigInt64Array/BigUint64Array in structured-cloning
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (272216 => 272217)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -736,10 +736,6 @@
return nullptr;
}
- auto& extensions = context->getExtensions();
- if (extensions.supports("GL_EXT_debug_marker"_s))
- extensions.pushGroupMarkerEXT("WebGLRenderingContext"_s);
-
std::unique_ptr<WebGLRenderingContextBase> renderingContext;
#if ENABLE(WEBGL2)
if (type == WebGLVersion::WebGL2)
Modified: trunk/Source/WebCore/platform/graphics/ExtensionsGL.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/ExtensionsGL.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/ExtensionsGL.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -281,12 +281,6 @@
// externally.
virtual GCGLint getGraphicsResetStatusARB() = 0;
- // GL_ANGLE_framebuffer_blit
- virtual void blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter) = 0;
-
- // GL_ANGLE_framebuffer_multisample
- virtual void renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height) = 0;
-
// GL_OES_vertex_array_object
virtual PlatformGLObject createVertexArrayOES() = 0;
virtual void deleteVertexArrayOES(PlatformGLObject) = 0;
@@ -296,11 +290,6 @@
// GL_ANGLE_translated_shader_source
virtual String getTranslatedShaderSourceANGLE(PlatformGLObject) = 0;
- // GL_EXT_debug_marker
- virtual void insertEventMarkerEXT(const String&) = 0;
- virtual void pushGroupMarkerEXT(const String&) = 0;
- virtual void popGroupMarkerEXT() = 0;
-
// GL_ARB_draw_buffers / GL_EXT_draw_buffers
virtual void drawBuffersEXT(GCGLSpan<const GCGLenum> bufs) = 0;
@@ -309,47 +298,6 @@
virtual void drawElementsInstancedANGLE(GCGLenum mode, GCGLsizei count, GCGLenum type, GCGLvoidptr offset, GCGLsizei primcount) = 0;
virtual void vertexAttribDivisorANGLE(GCGLuint index, GCGLuint divisor) = 0;
- // GL_ANGLE_robust_client_memory
- virtual void readPixelsRobustANGLE(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei* length, GCGLsizei* columns, GCGLsizei* rows, GCGLvoid* pixels) = 0;
- virtual void texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat* params) = 0;
- virtual void texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint* params) = 0;
-
- virtual void getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) = 0;
- virtual void getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLvoid** params) = 0;
- virtual void getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) = 0;
- virtual void getUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) = 0;
- virtual void getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint64* params) = 0;
- virtual void samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint* param) = 0;
- virtual void samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat* param) = 0;
- virtual void getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params) = 0;
-
- virtual void getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei* length, GCGLboolean* data) = 0; // NOLINT
- virtual void getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* val) = 0;
- virtual void getTexLevelParameterivRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getTexLevelParameterfvRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params) = 0;
-
- virtual void getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLvoid** params) = 0;
- virtual void getnUniformfvRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params) = 0;
- virtual void getnUniformivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getnUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) = 0;
- virtual void texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint* params) = 0;
- virtual void texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint* params) = 0;
- virtual void getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) = 0;
- virtual void samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint* param) = 0;
- virtual void samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint* param) = 0;
- virtual void getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) = 0;
-
- virtual void getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) = 0;
- virtual void getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint64* params) = 0;
- virtual void getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint64* params) = 0;
-
// Other functions.
#if !USE(ANGLE)
// EXT Robustness - uses getGraphicsResetStatusARB
@@ -357,16 +305,6 @@
virtual void getnUniformfvEXT(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLfloat* params) = 0;
virtual void getnUniformivEXT(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLint* params) = 0;
- virtual bool isNVIDIA() = 0;
- virtual bool isAMD() = 0;
- virtual bool isIntel() = 0;
- virtual bool isImagination() = 0;
- virtual String vendor() = 0;
-
- // Some configurations have bugs regarding built-in functions in their OpenGL drivers
- // that must be avoided. Ports should implement these flags on such configurations.
- virtual bool requiresBuiltInFunctionEmulation() = 0;
- virtual bool requiresRestrictedMaximumTextureSize() = 0;
#endif
};
Modified: trunk/Source/WebCore/platform/graphics/RemoteGraphicsContextGLProxyBase.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/RemoteGraphicsContextGLProxyBase.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/RemoteGraphicsContextGLProxyBase.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -155,41 +155,6 @@
void RemoteGraphicsContextGLProxyBase::getnUniformivEXT(GCGLuint, GCGLint, GCGLsizei, GCGLint*)
{
}
-
-bool RemoteGraphicsContextGLProxyBase::isNVIDIA()
-{
- return false;
-}
-
-bool RemoteGraphicsContextGLProxyBase::isAMD()
-{
- return false;
-}
-
-bool RemoteGraphicsContextGLProxyBase::isIntel()
-{
- return false;
-}
-
-bool RemoteGraphicsContextGLProxyBase::isImagination()
-{
- return false;
-}
-
-String RemoteGraphicsContextGLProxyBase::vendor()
-{
- return { };
-}
-
-bool RemoteGraphicsContextGLProxyBase::requiresBuiltInFunctionEmulation()
-{
- return false;
-}
-
-bool RemoteGraphicsContextGLProxyBase::requiresRestrictedMaximumTextureSize()
-{
- return false;
-}
#endif
}
#endif
Modified: trunk/Source/WebCore/platform/graphics/RemoteGraphicsContextGLProxyBase.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/RemoteGraphicsContextGLProxyBase.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/RemoteGraphicsContextGLProxyBase.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -79,17 +79,9 @@
bool isEnabled(const String&) final;
#if !USE(ANGLE)
- // FIXME: These are supposed to be removed in https://bugs.webkit.org/show_bug.cgi?id=218896.
void readnPixelsEXT(GCGLint, GCGLint, GCGLsizei, GCGLsizei, GCGLenum, GCGLenum, GCGLsizei, GCGLvoid*) final;
void getnUniformfvEXT(GCGLuint, GCGLint, GCGLsizei, GCGLfloat*) final;
void getnUniformivEXT(GCGLuint, GCGLint, GCGLsizei, GCGLint*) final;
- bool isNVIDIA() final;
- bool isAMD() final;
- bool isIntel() final;
- bool isImagination() final;
- String vendor() final;
- bool requiresBuiltInFunctionEmulation() final;
- bool requiresRestrictedMaximumTextureSize() final;
#endif
protected:
Modified: trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -33,10 +33,9 @@
namespace WebCore {
-ExtensionsGLANGLE::ExtensionsGLANGLE(GraphicsContextGLOpenGL* context, bool useIndexedGetString)
+ExtensionsGLANGLE::ExtensionsGLANGLE(GraphicsContextGLOpenGL* context)
: m_initializedAvailableExtensions(false)
, m_context(context)
- , m_useIndexedGetString(useIndexedGetString)
{
}
@@ -99,42 +98,15 @@
void ExtensionsGLANGLE::initializeAvailableExtensions()
{
- if (m_useIndexedGetString) {
- GLint numExtensions = 0;
- gl::GetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
- for (GLint i = 0; i < numExtensions; ++i)
- m_availableExtensions.add(gl::GetStringi(GL_EXTENSIONS, i));
- gl::GetIntegerv(GL_NUM_REQUESTABLE_EXTENSIONS_ANGLE, &numExtensions);
- for (GLint i = 0; i < numExtensions; ++i)
- m_requestableExtensions.add(gl::GetStringi(GL_REQUESTABLE_EXTENSIONS_ANGLE, i));
- } else {
- String extensionsString = getExtensions();
- for (auto& extension : extensionsString.split(' '))
- m_availableExtensions.add(extension);
- extensionsString = String(reinterpret_cast<const char*>(gl::GetString(GL_REQUESTABLE_EXTENSIONS_ANGLE)));
- for (auto& extension : extensionsString.split(' '))
- m_requestableExtensions.add(extension);
- }
+ String extensionsString = getExtensions();
+ for (auto& extension : extensionsString.split(' '))
+ m_availableExtensions.add(extension);
+ extensionsString = String(reinterpret_cast<const char*>(gl::GetString(GL_REQUESTABLE_EXTENSIONS_ANGLE)));
+ for (auto& extension : extensionsString.split(' '))
+ m_requestableExtensions.add(extension);
m_initializedAvailableExtensions = true;
}
-void ExtensionsGLANGLE::blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter)
-{
- // FIXME: consider adding support for APPLE_framebuffer_multisample.
- if (!m_context->makeContextCurrent())
- return;
-
- gl::BlitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
-}
-
-void ExtensionsGLANGLE::renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height);
-}
-
PlatformGLObject ExtensionsGLANGLE::createVertexArrayOES()
{
if (!m_context->makeContextCurrent())
@@ -175,24 +147,6 @@
gl::BindVertexArrayOES(array);
}
-void ExtensionsGLANGLE::insertEventMarkerEXT(const String&)
-{
- // FIXME: implement this function and add GL_EXT_debug_marker in supports().
- return;
-}
-
-void ExtensionsGLANGLE::pushGroupMarkerEXT(const String&)
-{
- // FIXME: implement this function and add GL_EXT_debug_marker in supports().
- return;
-}
-
-void ExtensionsGLANGLE::popGroupMarkerEXT(void)
-{
- // FIXME: implement this function and add GL_EXT_debug_marker in supports().
- return;
-}
-
bool ExtensionsGLANGLE::supportsExtension(const String& name)
{
return m_availableExtensions.contains(name) || m_requestableExtensions.contains(name);
@@ -248,291 +202,6 @@
return internalformat;
}
-// GL_ANGLE_robust_client_memory
-void ExtensionsGLANGLE::readPixelsRobustANGLE(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *pixels)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::ReadPixelsRobustANGLE(x, y, width, height, format, type, bufSize, length, columns, rows, pixels);
-}
-
-void ExtensionsGLANGLE::texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::TexParameterfvRobustANGLE(target, pname, bufSize, params);
-}
-
-void ExtensionsGLANGLE::texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::TexParameterivRobustANGLE(target, pname, bufSize, params);
-}
-
-void ExtensionsGLANGLE::getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetQueryivRobustANGLE(target, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetQueryObjectuivRobustANGLE(id, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetBufferPointervRobustANGLE(target, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetVertexAttribIivRobustANGLE(index, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetVertexAttribIuivRobustANGLE(index, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetUniformuivRobustANGLE(program, location, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
-}
-
-void ExtensionsGLANGLE::samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::SamplerParameterivRobustANGLE(sampler, pname, bufSize, param);
-}
-
-void ExtensionsGLANGLE::samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *param)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::SamplerParameterfvRobustANGLE(sampler, pname, bufSize, param);
-}
-
-void ExtensionsGLANGLE::getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetSamplerParameterivRobustANGLE(sampler, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetSamplerParameterfvRobustANGLE(sampler, pname, bufSize, length, params);
-}
-
-
-void ExtensionsGLANGLE::getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetFramebufferParameterivRobustANGLE(target, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetProgramInterfaceivRobustANGLE(program, programInterface, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLboolean *data)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetBooleani_vRobustANGLE(target, index, bufSize, length, data);
-}
-
-void ExtensionsGLANGLE::getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *val)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetMultisamplefvRobustANGLE(pname, index, bufSize, length, val);
-}
-
-void ExtensionsGLANGLE::getTexLevelParameterivRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetTexLevelParameterivRobustANGLE(target, level, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getTexLevelParameterfvRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetTexLevelParameterfvRobustANGLE(target, level, pname, bufSize, length, params);
-}
-
-
-void ExtensionsGLANGLE::getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetPointervRobustANGLERobustANGLE(pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getnUniformfvRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetnUniformfvRobustANGLE(program, location, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getnUniformivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetnUniformivRobustANGLE(program, location, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getnUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetnUniformuivRobustANGLE(program, location, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::TexParameterIivRobustANGLE(target, pname, bufSize, params);
-}
-
-void ExtensionsGLANGLE::texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::TexParameterIuivRobustANGLE(target, pname, bufSize, params);
-}
-
-void ExtensionsGLANGLE::getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetTexParameterIivRobustANGLE(target, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetTexParameterIuivRobustANGLE(target, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::SamplerParameterIivRobustANGLE(sampler, pname, bufSize, param);
-}
-
-void ExtensionsGLANGLE::samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *param)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::SamplerParameterIuivRobustANGLE(sampler, pname, bufSize, param);
-}
-
-void ExtensionsGLANGLE::getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetSamplerParameterIivRobustANGLE(sampler, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetSamplerParameterIuivRobustANGLE(sampler, pname, bufSize, length, params);
-}
-
-
-void ExtensionsGLANGLE::getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetQueryObjectivRobustANGLE(id, pname, bufSize, length, params);
-}
-
-void ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
-}
-
-void ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLuint64*>(params));
-}
-
-
} // namespace WebCore
#endif // ENABLE(WEBGL) && USE(ANGLE)
Modified: trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -27,16 +27,18 @@
#include "ExtensionsGL.h"
-#include "GraphicsContextGLOpenGL.h"
+#include <wtf/HashSet.h>
#include <wtf/text/StringHash.h>
namespace WebCore {
+class GraphicsContextGLOpenGL;
+
class ExtensionsGLANGLE : public ExtensionsGL {
WTF_MAKE_FAST_ALLOCATED;
public:
// This class only needs to be instantiated by GraphicsContextGLOpenGL implementations.
- ExtensionsGLANGLE(GraphicsContextGLOpenGL*, bool useIndexedGetString = false);
+ explicit ExtensionsGLANGLE(GraphicsContextGLOpenGL*);
virtual ~ExtensionsGLANGLE();
// ExtensionsGL methods.
@@ -49,60 +51,14 @@
void deleteVertexArrayOES(PlatformGLObject) override;
GCGLboolean isVertexArrayOES(PlatformGLObject) override;
void bindVertexArrayOES(PlatformGLObject) override;
- void insertEventMarkerEXT(const String&) override;
- void pushGroupMarkerEXT(const String&) override;
- void popGroupMarkerEXT(void) override;
void drawBuffersEXT(GCGLSpan<const GCGLenum>) override;
String getTranslatedShaderSourceANGLE(PlatformGLObject) override;
- void blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter) override;
- void renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height) override;
-
void drawArraysInstancedANGLE(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount) override;
void drawElementsInstancedANGLE(GCGLenum mode, GCGLsizei count, GCGLenum type, GCGLvoidptr offset, GCGLsizei primcount) override;
void vertexAttribDivisorANGLE(GCGLuint index, GCGLuint divisor) override;
- // GL_ANGLE_robust_client_memory
- void readPixelsRobustANGLE(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *pixels) override;
- void texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *params) override;
- void texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params) override;
- void getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params) override;
- void getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void getUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params) override;
- void samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param) override;
- void samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *param) override;
- void getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) override;
-
- void getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLboolean *data) override; // NOLINT
- void getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *val) override;
- void getTexLevelParameterivRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getTexLevelParameterfvRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) override;
-
- void getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params) override;
- void getnUniformfvRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) override;
- void getnUniformivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getnUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params) override;
- void texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *params) override;
- void getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param) override;
- void samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *param) override;
- void getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
-
- void getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params) override;
- void getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params) override;
-
// Only for non-WebGL 2.0 contexts.
GCGLenum adjustWebGL1TextureInternalFormat(GCGLenum internalformat, GCGLenum format, GCGLenum type);
@@ -119,8 +75,6 @@
// Weak pointer back to GraphicsContextGLOpenGL.
GraphicsContextGLOpenGL* m_context;
- bool m_useIndexedGetString { false };
-
// Whether the WebGL 1.0-related floating-point renderability extensions have been enabled.
bool m_webglColorBufferFloatRGB { false };
bool m_webglColorBufferFloatRGBA { false };
Modified: trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -32,6 +32,7 @@
#include "ANGLEHeaders.h"
#include "ExtensionsGLANGLE.h"
#include "GraphicsContextGLANGLEUtilities.h"
+#include "GraphicsContextGLOpenGL.h"
#include "ImageBuffer.h"
#include "ImageData.h"
#include "IntRect.h"
Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -48,22 +48,6 @@
ExtensionsGLOpenGL::~ExtensionsGLOpenGL() = default;
-void ExtensionsGLOpenGL::blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- ::glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
-}
-
-void ExtensionsGLOpenGL::renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
-{
- if (!m_context->makeContextCurrent())
- return;
-
- ::glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height);
-}
-
PlatformGLObject ExtensionsGLOpenGL::createVertexArrayOES()
{
if (!m_context->makeContextCurrent())
@@ -127,24 +111,6 @@
#endif
}
-void ExtensionsGLOpenGL::insertEventMarkerEXT(const String&)
-{
- // FIXME: implement this function and add GL_EXT_debug_marker in supports().
- return;
-}
-
-void ExtensionsGLOpenGL::pushGroupMarkerEXT(const String&)
-{
- // FIXME: implement this function and add GL_EXT_debug_marker in supports().
- return;
-}
-
-void ExtensionsGLOpenGL::popGroupMarkerEXT(void)
-{
- // FIXME: implement this function and add GL_EXT_debug_marker in supports().
- return;
-}
-
bool ExtensionsGLOpenGL::supportsExtension(const String& name)
{
// GL_ANGLE_framebuffer_blit and GL_ANGLE_framebuffer_multisample are "fake". They are implemented using other
Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -27,11 +27,12 @@
#include "ExtensionsGLOpenGLCommon.h"
-#include "GraphicsContextGLOpenGL.h"
#include <wtf/text/StringHash.h>
namespace WebCore {
+class GraphicsContextGLOpenGL;
+
class ExtensionsGLOpenGL : public ExtensionsGLOpenGLCommon {
WTF_MAKE_FAST_ALLOCATED;
public:
@@ -40,16 +41,10 @@
virtual ~ExtensionsGLOpenGL();
// ExtensionsGL methods.
- void blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter) override;
- void renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height) override;
-
PlatformGLObject createVertexArrayOES() override;
void deleteVertexArrayOES(PlatformGLObject) override;
GCGLboolean isVertexArrayOES(PlatformGLObject) override;
void bindVertexArrayOES(PlatformGLObject) override;
- void insertEventMarkerEXT(const String&) override;
- void pushGroupMarkerEXT(const String&) override;
- void popGroupMarkerEXT(void) override;
void drawBuffersEXT(GCGLSpan<const GCGLenum>) override;
void drawArraysInstancedANGLE(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount) override;
Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -254,185 +254,6 @@
m_context->synthesizeGLError(GL_INVALID_OPERATION);
}
-void ExtensionsGLOpenGLCommon::readPixelsRobustANGLE(int, int, GCGLsizei, GCGLsizei, GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLsizei *, GCGLsizei *, void *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::texParameterfvRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, const GCGLfloat *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::texParameterivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, const GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getQueryivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getQueryObjectuivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getBufferPointervRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, void **)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getVertexAttribIivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getVertexAttribIuivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getUniformuivRobustANGLE(GCGLuint, int, GCGLsizei, GCGLsizei *, GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getBufferParameteri64vRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint64 *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::samplerParameterivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, const GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::samplerParameterfvRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, const GCGLfloat *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getSamplerParameterivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getSamplerParameterfvRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLfloat *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-
-void ExtensionsGLOpenGLCommon::getFramebufferParameterivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getProgramInterfaceivRobustANGLE(GCGLuint, GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getBooleani_vRobustANGLE(GCGLenum, GCGLuint, GCGLsizei, GCGLsizei *, GCGLboolean *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getMultisamplefvRobustANGLE(GCGLenum, GCGLuint, GCGLsizei, GCGLsizei *, GCGLfloat *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getTexLevelParameterivRobustANGLE(GCGLenum, int, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getTexLevelParameterfvRobustANGLE(GCGLenum, int, GCGLenum, GCGLsizei, GCGLsizei *, GCGLfloat *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-
-void ExtensionsGLOpenGLCommon::getPointervRobustANGLERobustANGLE(GCGLenum, GCGLsizei, GCGLsizei *, void **)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getnUniformfvRobustANGLE(GCGLuint, int, GCGLsizei, GCGLsizei *, GCGLfloat *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getnUniformivRobustANGLE(GCGLuint, int, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getnUniformuivRobustANGLE(GCGLuint, int, GCGLsizei, GCGLsizei *, GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::texParameterIivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, const GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::texParameterIuivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, const GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getTexParameterIivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getTexParameterIuivRobustANGLE(GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::samplerParameterIivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, const GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::samplerParameterIuivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, const GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getSamplerParameterIivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getSamplerParameterIuivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLuint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-
-void ExtensionsGLOpenGLCommon::getQueryObjectivRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getQueryObjecti64vRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint64 *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-void ExtensionsGLOpenGLCommon::getQueryObjectui64vRobustANGLE(GCGLuint, GCGLenum, GCGLsizei, GCGLsizei *, GCGLuint64 *)
-{
- m_context->synthesizeGLError(GL_INVALID_OPERATION);
-}
-
-
} // namespace WebCore
#endif // ENABLE(WEBGL) && !USE(ANGLE)
Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -28,12 +28,13 @@
#include "ExtensionsGL.h"
-#include "GraphicsContextGLOpenGL.h"
#include <wtf/HashSet.h>
#include <wtf/text/StringHash.h>
namespace WebCore {
+class GraphicsContextGLOpenGL;
+
class ExtensionsGLOpenGLCommon : public ExtensionsGL {
WTF_MAKE_FAST_ALLOCATED;
public:
@@ -55,59 +56,19 @@
String getTranslatedShaderSourceANGLE(PlatformGLObject) override;
// EXT Robustness - uses getGraphicsResetStatusARB()
- void readnPixelsEXT(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, void *data) override;
- void getnUniformfvEXT(GCGLuint program, int location, GCGLsizei bufSize, float *params) override;
- void getnUniformivEXT(GCGLuint program, int location, GCGLsizei bufSize, int *params) override;
+ void readnPixelsEXT(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, void *data);
+ void getnUniformfvEXT(GCGLuint program, int location, GCGLsizei bufSize, float *params);
+ void getnUniformivEXT(GCGLuint program, int location, GCGLsizei bufSize, int *params);
- bool isNVIDIA() override { return m_isNVIDIA; }
- bool isAMD() override { return m_isAMD; }
- bool isIntel() override { return m_isIntel; }
- bool isImagination() override { return m_isImagination; }
- String vendor() override { return m_vendor; }
+ bool isNVIDIA() const { return m_isNVIDIA; }
+ bool isAMD() const { return m_isAMD; }
+ bool isIntel() const { return m_isIntel; }
+ bool isImagination() const { return m_isImagination; }
+ String vendor() const { return m_vendor; }
- bool requiresBuiltInFunctionEmulation() override { return m_requiresBuiltInFunctionEmulation; }
- bool requiresRestrictedMaximumTextureSize() override { return m_requiresRestrictedMaximumTextureSize; }
+ bool requiresBuiltInFunctionEmulation() const { return m_requiresBuiltInFunctionEmulation; }
+ bool requiresRestrictedMaximumTextureSize() const { return m_requiresRestrictedMaximumTextureSize; }
- // GL_ANGLE_robust_client_memory
- void readPixelsRobustANGLE(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *pixels) override;
- void texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *params) override;
- void texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params) override;
- void getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params) override;
- void getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void getUniformuivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params) override;
- void samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param) override;
- void samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *param) override;
- void getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) override;
-
- void getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLboolean *data) override;
- void getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *val) override;
- void getTexLevelParameterivRobustANGLE(GCGLenum target, int level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getTexLevelParameterfvRobustANGLE(GCGLenum target, int level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) override;
-
- void getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params) override;
- void getnUniformfvRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) override;
- void getnUniformivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getnUniformuivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params) override;
- void texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *params) override;
- void getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
- void samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param) override;
- void samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *param) override;
- void getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params) override;
-
- void getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) override;
- void getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params) override;
- void getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params) override;
-
protected:
friend class ExtensionsGLOpenGLES;
ExtensionsGLOpenGLCommon(GraphicsContextGLOpenGL*, bool useIndexedGetString);
Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -100,11 +100,6 @@
m_context->synthesizeGLError(GL_INVALID_OPERATION);
}
-void ExtensionsGLOpenGLES::blitFramebufferANGLE(GCGLint, GCGLint, GCGLint, GCGLint, GCGLint, GCGLint, GCGLint, GCGLint, GCGLbitfield, GCGLenum)
-{
- notImplemented();
-}
-
void ExtensionsGLOpenGLES::renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
{
if (!m_context->makeContextCurrent())
@@ -115,21 +110,6 @@
notImplemented();
}
-void ExtensionsGLOpenGLES::insertEventMarkerEXT(const String&)
-{
- notImplemented();
-}
-
-void ExtensionsGLOpenGLES::pushGroupMarkerEXT(const String&)
-{
- notImplemented();
-}
-
-void ExtensionsGLOpenGLES::popGroupMarkerEXT(void)
-{
- notImplemented();
-}
-
PlatformGLObject ExtensionsGLOpenGLES::createVertexArrayOES()
{
if (m_glGenVertexArraysOES) {
Modified: trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -64,6 +64,8 @@
namespace WebCore {
+class GraphicsContextGLOpenGL;
+
class ExtensionsGLOpenGLES : public ExtensionsGLOpenGLCommon {
public:
// This class only needs to be instantiated by GraphicsContextGLOpenGL implementations.
@@ -75,11 +77,7 @@
// Extension3D methods
bool isEnabled(const String&) override;
- void blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter) override;
- void renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height) override;
- void insertEventMarkerEXT(const String&) override;
- void pushGroupMarkerEXT(const String&) override;
- void popGroupMarkerEXT(void) override;
+ void renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height);
PlatformGLObject createVertexArrayOES() override;
void deleteVertexArrayOES(PlatformGLObject) override;
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -45,6 +45,7 @@
#if !USE(ANGLE)
#include "ANGLEWebKitBridge.h"
+#include "ExtensionsGLOpenGLCommon.h"
#endif
// FIXME: Find a better way to avoid the name confliction for NO_ERROR.
@@ -493,7 +494,12 @@
// all methods it contains may necessarily be supported on the
// current hardware. Must call ExtensionsGL::supports() to
// determine this.
+#if !USE(ANGLE)
+ // Use covariant return type for OPENGL/OPENGL_ES
+ ExtensionsGLOpenGLCommon& getExtensions() final;
+#else
ExtensionsGL& getExtensions() final;
+#endif
void setFailNextGPUStatusCheck() final { m_failNextStatusCheck = true; }
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -106,7 +106,7 @@
// We don't allow the logic where stencil is required and depth is not.
// See GraphicsContextGLOpenGL::validateAttributes.
- ExtensionsGL& extensions = getExtensions();
+ ExtensionsGLOpenGLCommon& extensions = getExtensions();
// Use a 24 bit depth buffer where we know we have it.
if (extensions.supports("GL_EXT_packed_depth_stencil"))
internalDepthStencilFormat = GL_DEPTH24_STENCIL8_EXT;
@@ -407,7 +407,7 @@
}
#if !PLATFORM(GTK)
-ExtensionsGL& GraphicsContextGLOpenGL::getExtensions()
+ExtensionsGLOpenGLCommon& GraphicsContextGLOpenGL::getExtensions()
{
if (!m_extensions)
m_extensions = makeUnique<ExtensionsGLOpenGL>(this, isGLES2Compliant());
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -118,7 +118,7 @@
{
auto attrs = contextAttributes();
- ExtensionsGL& extensions = getExtensions();
+ ExtensionsGLOpenGLCommon& extensions = getExtensions();
if (attrs.stencil) {
if (extensions.supports(packedDepthStencilExtension)) {
extensions.ensureEnabled(packedDepthStencilExtension);
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -267,7 +267,7 @@
}
#if !PLATFORM(GTK)
-ExtensionsGL& GraphicsContextGLOpenGL::getExtensions()
+ExtensionsGLOpenGLCommon& GraphicsContextGLOpenGL::getExtensions()
{
if (!m_extensions)
m_extensions = makeUnique<ExtensionsGLOpenGLES>(this, isGLES2Compliant());
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (272216 => 272217)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -443,7 +443,7 @@
#endif
#if PLATFORM(GTK) && !USE(ANGLE)
-ExtensionsGL& GraphicsContextGLOpenGL::getExtensions()
+ExtensionsGLOpenGLCommon& GraphicsContextGLOpenGL::getExtensions()
{
if (!m_extensions) {
#if USE(OPENGL_ES)
Modified: trunk/Source/WebKit/ChangeLog (272216 => 272217)
--- trunk/Source/WebKit/ChangeLog 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebKit/ChangeLog 2021-02-02 18:10:39 UTC (rev 272217)
@@ -1,3 +1,62 @@
+2021-02-02 Rini Patel <[email protected]>
+
+ Remove unused functions from GraphicsContextGL and ExtensionsGL
+ https://bugs.webkit.org/show_bug.cgi?id=218896
+
+ Reviewed by Dean Jackson.
+
+ * GPUProcess/graphics/RemoteGraphicsContextGL.messages.in:
+ * GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h:
+ (getGraphicsResetStatusARB):
+ (getTranslatedShaderSourceANGLE):
+ (blitFramebufferANGLE): Deleted.
+ (renderbufferStorageMultisampleANGLE): Deleted.
+ (insertEventMarkerEXT): Deleted.
+ (pushGroupMarkerEXT): Deleted.
+ (popGroupMarkerEXT): Deleted.
+ * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h:
+ * WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp:
+ (WebKit::RemoteGraphicsContextGLProxy::blitFramebufferANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::renderbufferStorageMultisampleANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::insertEventMarkerEXT): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::pushGroupMarkerEXT): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::popGroupMarkerEXT): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::readPixelsRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::texParameterfvRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::texParameterivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getQueryivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getQueryObjectuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getBufferPointervRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getVertexAttribIivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getVertexAttribIuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getUniformuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getBufferParameteri64vRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::samplerParameterivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::samplerParameterfvRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getSamplerParameterivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getSamplerParameterfvRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getFramebufferParameterivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getProgramInterfaceivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getBooleani_vRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getMultisamplefvRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getTexLevelParameterivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getTexLevelParameterfvRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getPointervRobustANGLERobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getnUniformfvRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getnUniformivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getnUniformuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::texParameterIivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::texParameterIuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getTexParameterIivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getTexParameterIuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::samplerParameterIivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::samplerParameterIuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getSamplerParameterIivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getSamplerParameterIuivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getQueryObjectivRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getQueryObjecti64vRobustANGLE): Deleted.
+ (WebKit::RemoteGraphicsContextGLProxy::getQueryObjectui64vRobustANGLE): Deleted.
+
2021-02-02 Youenn Fablet <[email protected]>
Recover MediaStreamTrack audio rendering from GPUProcess crash
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.messages.in (272216 => 272217)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.messages.in 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.messages.in 2021-02-02 18:10:39 UTC (rev 272217)
@@ -274,16 +274,11 @@
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 BlitFramebufferANGLE(int32_t srcX0, int32_t srcY0, int32_t srcX1, int32_t srcY1, int32_t dstX0, int32_t dstY0, int32_t dstX1, int32_t dstY1, uint32_t mask, uint32_t filter)
- void RenderbufferStorageMultisampleANGLE(uint32_t target, int32_t samples, uint32_t internalformat, int32_t width, int32_t height)
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 InsertEventMarkerEXT(String arg0)
- void PushGroupMarkerEXT(String arg0)
- void PopGroupMarkerEXT()
void DrawBuffersEXT(IPC::ArrayReference<uint32_t> bufs)
void DrawArraysInstancedANGLE(uint32_t mode, int32_t first, int32_t count, int32_t primcount)
void DrawElementsInstancedANGLE(uint32_t mode, int32_t count, uint32_t type, uint64_t offset, int32_t primcount)
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h (272216 => 272217)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLFunctionsGenerated.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -1118,14 +1118,6 @@
returnValue = m_context->getExtensions().getGraphicsResetStatusARB();
completionHandler(returnValue);
}
- void blitFramebufferANGLE(int32_t srcX0, int32_t srcY0, int32_t srcX1, int32_t srcY1, int32_t dstX0, int32_t dstY0, int32_t dstX1, int32_t dstY1, uint32_t mask, uint32_t filter)
- {
- m_context->getExtensions().blitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
- }
- void renderbufferStorageMultisampleANGLE(uint32_t target, int32_t samples, uint32_t internalformat, int32_t width, int32_t height)
- {
- m_context->getExtensions().renderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height);
- }
void createVertexArrayOES(CompletionHandler<void(uint32_t)>&& completionHandler)
{
PlatformGLObject returnValue = { };
@@ -1152,18 +1144,6 @@
returnValue = m_context->getExtensions().getTranslatedShaderSourceANGLE(arg0);
completionHandler(WTFMove(returnValue));
}
- void insertEventMarkerEXT(String&& arg0)
- {
- m_context->getExtensions().insertEventMarkerEXT(arg0);
- }
- void pushGroupMarkerEXT(String&& arg0)
- {
- m_context->getExtensions().pushGroupMarkerEXT(arg0);
- }
- void popGroupMarkerEXT()
- {
- m_context->getExtensions().popGroupMarkerEXT();
- }
void drawBuffersEXT(IPC::ArrayReference<uint32_t>&& bufs)
{
m_context->getExtensions().drawBuffersEXT(makeGCGLSpan(reinterpret_cast<const GCGLenum*>(bufs.data()), bufs.size()));
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h (272216 => 272217)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h 2021-02-02 18:10:39 UTC (rev 272217)
@@ -313,56 +313,16 @@
void uniformBlockBinding(PlatformGLObject program, GCGLuint uniformBlockIndex, GCGLuint uniformBlockBinding) final;
void getActiveUniformBlockiv(GCGLuint program, GCGLuint uniformBlockIndex, GCGLenum pname, GCGLSpan<GCGLint> params) final;
GCGLint getGraphicsResetStatusARB() final;
- void blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter) final;
- void renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height) 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 insertEventMarkerEXT(const String& arg0) final;
- void pushGroupMarkerEXT(const String& arg0) final;
- void popGroupMarkerEXT() final;
void drawBuffersEXT(GCGLSpan<const GCGLenum> bufs) final;
void drawArraysInstancedANGLE(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount) final;
void drawElementsInstancedANGLE(GCGLenum mode, GCGLsizei count, GCGLenum type, GCGLvoidptr offset, GCGLsizei primcount) final;
void vertexAttribDivisorANGLE(GCGLuint index, GCGLuint divisor) final;
void getInternalformativ(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLSpan<GCGLint> params) final;
- void readPixelsRobustANGLE(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei* length, GCGLsizei* columns, GCGLsizei* rows, GCGLvoid* pixels) final;
- void texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat* params) final;
- void texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint* params) final;
- void getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) final;
- void getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLvoid** params) final;
- void getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) final;
- void getUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) final;
- void getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint64* params) final;
- void samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint* param) final;
- void samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat* param) final;
- void getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params) final;
- void getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei* length, GCGLboolean* data) final; // NOLINT
- void getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* val) final;
- void getTexLevelParameterivRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getTexLevelParameterfvRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params) final;
- void getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLvoid** params) final;
- void getnUniformfvRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params) final;
- void getnUniformivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getnUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) final;
- void texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint* params) final;
- void texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint* params) final;
- void getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) final;
- void samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint* param) final;
- void samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint* param) final;
- void getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params) final;
- void getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params) final;
- void getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint64* params) final;
- void getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint64* params) final;
void multiDrawArraysANGLE(GCGLenum mode, GCGLSpan<const GCGLint> firsts, GCGLSpan<const GCGLsizei> counts, GCGLsizei drawcount) final;
void multiDrawArraysInstancedANGLE(GCGLenum mode, GCGLSpan<const GCGLint> firsts, GCGLSpan<const GCGLsizei> counts, GCGLSpan<const GCGLsizei> instanceCounts, GCGLsizei drawcount) final;
void multiDrawElementsANGLE(GCGLenum mode, GCGLSpan<const GCGLsizei> counts, GCGLenum type, GCGLSpan<const GCGLint> offsets, GCGLsizei drawcount) final;
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp (272216 => 272217)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp 2021-02-02 17:46:32 UTC (rev 272216)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxyFunctionsGenerated.cpp 2021-02-02 18:10:39 UTC (rev 272217)
@@ -1380,16 +1380,6 @@
return returnValue;
}
-void RemoteGraphicsContextGLProxy::blitFramebufferANGLE(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter)
-{
- send(Messages::RemoteGraphicsContextGL::BlitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), m_graphicsContextGLIdentifier);
-}
-
-void RemoteGraphicsContextGLProxy::renderbufferStorageMultisampleANGLE(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
-{
- send(Messages::RemoteGraphicsContextGL::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height), m_graphicsContextGLIdentifier);
-}
-
PlatformGLObject RemoteGraphicsContextGLProxy::createVertexArrayOES()
{
uint32_t returnValue = { };
@@ -1421,21 +1411,6 @@
return returnValue;
}
-void RemoteGraphicsContextGLProxy::insertEventMarkerEXT(const String& arg0)
-{
- send(Messages::RemoteGraphicsContextGL::InsertEventMarkerEXT(arg0), m_graphicsContextGLIdentifier);
-}
-
-void RemoteGraphicsContextGLProxy::pushGroupMarkerEXT(const String& arg0)
-{
- send(Messages::RemoteGraphicsContextGL::PushGroupMarkerEXT(arg0), m_graphicsContextGLIdentifier);
-}
-
-void RemoteGraphicsContextGLProxy::popGroupMarkerEXT()
-{
- send(Messages::RemoteGraphicsContextGL::PopGroupMarkerEXT(), m_graphicsContextGLIdentifier);
-}
-
void RemoteGraphicsContextGLProxy::drawBuffersEXT(GCGLSpan<const GCGLenum> bufs)
{
send(Messages::RemoteGraphicsContextGL::DrawBuffersEXT(IPC::ArrayReference<uint32_t>(reinterpret_cast<const uint32_t*>(bufs.data), bufs.bufSize)), m_graphicsContextGLIdentifier);
@@ -1485,182 +1460,7 @@
send(Messages::RemoteGraphicsContextGL::MultiDrawElementsInstancedANGLE(mode, IPC::ArrayReference<int32_t>(reinterpret_cast<const int32_t*>(counts.data), counts.bufSize), type, IPC::ArrayReference<int32_t>(reinterpret_cast<const int32_t*>(offsets.data), offsets.bufSize), IPC::ArrayReference<int32_t>(reinterpret_cast<const int32_t*>(instanceCounts.data), instanceCounts.bufSize), drawcount), m_graphicsContextGLIdentifier);
}
-void RemoteGraphicsContextGLProxy::readPixelsRobustANGLE(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei* length, GCGLsizei* columns, GCGLsizei* rows, GCGLvoid* pixels)
-{
- notImplemented();
}
-void RemoteGraphicsContextGLProxy::texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLvoid** params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint64* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint* param)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat* param)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei* length, GCGLboolean* data) // NOLINT
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* val)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getTexLevelParameterivRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getTexLevelParameterfvRobustANGLE(GCGLenum target, GCGLint level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLvoid** params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getnUniformfvRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLfloat* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getnUniformivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getnUniformuivRobustANGLE(GCGLuint program, GCGLint location, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint* param)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint* param)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint64* params)
-{
- notImplemented();
-}
-
-void RemoteGraphicsContextGLProxy::getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLuint64* params)
-{
- notImplemented();
-}
-
-}
-
#endif
