WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-218896-20201204153659.patch (text/plain), 62.31 KB, created by
Rini Patel
on 2020-12-04 15:37:01 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rini Patel
Created:
2020-12-04 15:37:01 PST
Size:
62.31 KB
patch
obsolete
>Subversion Revision: 270443 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 7ae28930b74fbfd7301d68f9b1b0bcf78a86c9f7..74996308c042988c8ec8d386da173ec1407e75b1 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,129 @@ >+2020-12-04 Rini Patel <rini_patel@apple.com> >+ >+ Remove unused functions from GraphicsContextGL and ExtensionsGL >+ https://bugs.webkit.org/show_bug.cgi?id=218896 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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/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/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): >+ > 2020-12-04 Peng Liu <peng.liu6@apple.com> > > [MSE] Move track buffer management from SourceBuffer to SourceBufferPrivate >diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp >index 72c2644666cf03a2f59f1e09fe93293cb80b6bae..b934c1e89c251ac0b008371ff31fdb4f99712009 100644 >--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp >+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp >@@ -742,10 +742,6 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(Can > 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 == "webgl2") >diff --git a/Source/WebCore/platform/graphics/ExtensionsGL.h b/Source/WebCore/platform/graphics/ExtensionsGL.h >index c4e7778db6a448fd0a5e651591feea1453863823..62d583000a15c67d2f8a508b4fc6b7e884c4b4d6 100644 >--- a/Source/WebCore/platform/graphics/ExtensionsGL.h >+++ b/Source/WebCore/platform/graphics/ExtensionsGL.h >@@ -278,12 +278,6 @@ public: > // 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; >@@ -293,11 +287,6 @@ public: > // 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; > >@@ -306,47 +295,6 @@ public: > 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 >@@ -354,16 +302,6 @@ public: > 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 > > }; >diff --git a/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp b/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp >index b7db4fd2041b3bbc8bb9a7733e89beeaaeb6f789..ce46c7a75a5e2b62f2ab9fe02b9bec1f6a70fb9a 100644 >--- a/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp >+++ b/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp >@@ -43,10 +43,9 @@ typedef void* GLeglContext; > > namespace WebCore { > >-ExtensionsGLANGLE::ExtensionsGLANGLE(GraphicsContextGLOpenGL* context, bool useIndexedGetString) >+ExtensionsGLANGLE::ExtensionsGLANGLE(GraphicsContextGLOpenGL* context) > : m_initializedAvailableExtensions(false) > , m_context(context) >- , m_useIndexedGetString(useIndexedGetString) > { > } > >@@ -109,42 +108,15 @@ String ExtensionsGLANGLE::getTranslatedShaderSourceANGLE(PlatformGLObject shader > > 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()) >@@ -185,24 +157,6 @@ void ExtensionsGLANGLE::bindVertexArrayOES(PlatformGLObject array) > 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); >@@ -258,291 +212,6 @@ GCGLenum ExtensionsGLANGLE::adjustWebGL1TextureInternalFormat(GCGLenum internalf > 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(GRAPHICS_CONTEXT_GL) && USE(ANGLE) >diff --git a/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h b/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h >index b2d277b9ac9d27860f55ababf8cfe55e84b5f57e..004233772034bfa3eac137dc363480916deaaf7a 100644 >--- a/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h >+++ b/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h >@@ -36,7 +36,7 @@ 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 +49,14 @@ public: > 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 +73,6 @@ private: > // 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 }; >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp >index add5f352ae4de6b6d5dc191e673b5aafa56de95f..c306467488b07acabbd17ecac8b6a158262423d2 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp >@@ -48,22 +48,6 @@ ExtensionsGLOpenGL::ExtensionsGLOpenGL(GraphicsContextGLOpenGL* context, bool us > 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 @@ void ExtensionsGLOpenGL::bindVertexArrayOES(PlatformGLObject array) > #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 >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h >index 4750226ececef44396e9938676cb639be83437b6..0adbd7050b7e3f77e018894332ffc87cf30d90c5 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.h >@@ -40,16 +40,10 @@ public: > 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; >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp >index 693fb93a67fbc8407080482c8eebe168171273b0..332c824249724bb9636eaabea03c2c3758e016ff 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp >@@ -254,185 +254,6 @@ void ExtensionsGLOpenGLCommon::getnUniformivEXT(GCGLuint, int, GCGLsizei, GCGLin > 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(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES)) >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h >index 3f1040162ffa07a2dc130abb22fb1b1ffc3fdf20..1018a17eb88f7d19a284e6d5334e7a82b8f6ac3f 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h >@@ -55,58 +55,18 @@ public: > 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; >- >- 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 requiresBuiltInFunctionEmulation() override { return m_requiresBuiltInFunctionEmulation; } >- bool requiresRestrictedMaximumTextureSize() override { 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; >+ 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() 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() const { return m_requiresBuiltInFunctionEmulation; } >+ bool requiresRestrictedMaximumTextureSize() const { return m_requiresRestrictedMaximumTextureSize; } > > protected: > friend class ExtensionsGLOpenGLES; >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp >index e1e43bf5392885a24fbb33cb26b5f6e491fbe073..07d097c2c55c3120c4deffa9bb6ae264b4be48d7 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp >@@ -100,11 +100,6 @@ void ExtensionsGLOpenGLES::renderbufferStorageMultisampleIMG(unsigned long targe > 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 @@ void ExtensionsGLOpenGLES::renderbufferStorageMultisampleANGLE(GCGLenum target, > notImplemented(); > } > >-void ExtensionsGLOpenGLES::insertEventMarkerEXT(const String&) >-{ >- notImplemented(); >-} >- >-void ExtensionsGLOpenGLES::pushGroupMarkerEXT(const String&) >-{ >- notImplemented(); >-} >- >-void ExtensionsGLOpenGLES::popGroupMarkerEXT(void) >-{ >- notImplemented(); >-} >- > PlatformGLObject ExtensionsGLOpenGLES::createVertexArrayOES() > { > if (m_glGenVertexArraysOES) { >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h >index 5c76037fa7bc6e8eee3e673f99a7dfc2f78fb4d2..693d03c73f0ec8310b3cd2eb8a3dd3b326946fa6 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h >@@ -75,11 +75,7 @@ public: > > // 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; >diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h >index 9ce05bd578408d9b18e888a7100f7b2b1529b9e7..e38c513cf55b1433e8918dc578806eb0a15e4a39 100644 >--- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h >+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h >@@ -481,8 +481,12 @@ public: > // all methods it contains may necessarily be supported on the > // current hardware. Must call ExtensionsGL::supports() to > // determine this. >+#if USE(ANGLE) > ExtensionsGL& getExtensions() final; >- >+#else >+ // Use covariant return type for OPENGL/OPENGL_ES >+ ExtensionsGLOpenGLCommon& getExtensions() final; >+#endif > void setFailNextGPUStatusCheck() final { m_failNextStatusCheck = true; } > > unsigned textureSeed(GCGLuint texture) { return m_state.textureSeedCount.count(texture); } >diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp >index 13bca74ec86734fdfd6bb78099046ba8a8185dab..536ce3a4f263042e663a3cad3f28b2f1e2dae157 100644 >--- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp >+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp >@@ -116,7 +116,7 @@ bool GraphicsContextGLOpenGL::reshapeFBOs(const IntSize& size) > // 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; >@@ -417,7 +417,7 @@ void GraphicsContextGLOpenGL::clearDepth(GCGLclampf depth) > } > > #if !PLATFORM(GTK) >-ExtensionsGL& GraphicsContextGLOpenGL::getExtensions() >+ExtensionsGLOpenGLCommon& GraphicsContextGLOpenGL::getExtensions() > { > if (!m_extensions) > m_extensions = makeUnique<ExtensionsGLOpenGL>(this, isGLES2Compliant()); >diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp >index e78bf4743b9ce39437fac16db6be00985b0a5815..eb55b5131104219ce2e7f546975341b3ee7f2ee3 100644 >--- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp >+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp >@@ -118,7 +118,7 @@ void GraphicsContextGLOpenGL::validateDepthStencil(const char* packedDepthStenci > { > auto attrs = contextAttributes(); > >- ExtensionsGL& extensions = getExtensions(); >+ ExtensionsGLOpenGLCommon& extensions = getExtensions(); > if (attrs.stencil) { > if (extensions.supports(packedDepthStencilExtension)) { > extensions.ensureEnabled(packedDepthStencilExtension); >diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp >index b82d16417c2f5191d044248746e7838a867ae502..0e78d0838ccb16a1a03d38b573708e195fea0c52 100644 >--- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp >+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp >@@ -254,7 +254,7 @@ void GraphicsContextGLOpenGL::clearDepth(GCGLclampf depth) > } > > #if !PLATFORM(GTK) >-ExtensionsGL& GraphicsContextGLOpenGL::getExtensions() >+ExtensionsGLOpenGLCommon& GraphicsContextGLOpenGL::getExtensions() > { > if (!m_extensions) > m_extensions = makeUnique<ExtensionsGLOpenGLES>(this, isGLES2Compliant());
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=415466">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
ews-feeder
:
commit-queue-
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 218896
:
415038
|
415057
|
415091
|
415160
|
415165
|
415167
|
415232
|
415338
|
415353
|
415439
|
415464
|
415466
|
415473
|
415480
|
415602
|
415603
|
415826
|
415827
|
415829
|
415831
|
415834
|
415955
|
416296
|
417020
|
418327
|
418458