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-20201203135029.patch (text/plain), 57.29 KB, created by
Rini Patel
on 2020-12-03 13:50:31 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Rini Patel
Created:
2020-12-03 13:50:31 PST
Size:
57.29 KB
patch
obsolete
>Subversion Revision: 270255 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 5866f7893ef668acfa9d53d5ba30a6f318ae0377..ad5274fe92981721783f3e22a2f636c8792b1713 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,36 @@ >+2020-11-30 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::blitFramebuffer): Deleted. >+ (WebCore::ExtensionsGLANGLE::renderbufferStorageMultisample): Deleted. >+ (WebCore::ExtensionsGLANGLE::insertEventMarkerEXT): Deleted. >+ (WebCore::ExtensionsGLANGLE::pushGroupMarkerEXT): Deleted. >+ (WebCore::ExtensionsGLANGLE::popGroupMarkerEXT): Deleted. >+ * platform/graphics/angle/ExtensionsGLANGLE.h: >+ * platform/graphics/opengl/ExtensionsGLOpenGL.cpp: >+ (WebCore::ExtensionsGLOpenGL::blitFramebuffer): Deleted. >+ (WebCore::ExtensionsGLOpenGL::renderbufferStorageMultisample): Deleted. >+ * platform/graphics/opengl/ExtensionsGLOpenGL.h: >+ * platform/graphics/opengl/ExtensionsGLOpenGLES.cpp: >+ (WebCore::ExtensionsGLOpenGLES::blitFramebuffer): Deleted. >+ * platform/graphics/opengl/ExtensionsGLOpenGLES.h: >+ > 2020-11-30 Youenn Fablet <youenn@apple.com> > > Missing WebRTC Metrics in iOS 14 Beta 5 >diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp >index 55784e1a33ec05b40295310f6eb0e7ce0a5e98dd..46c1204cf0409bf52453b4d7f0f5ba8071ca646f 100644 >--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp >+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp >@@ -742,8 +742,7 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(Can > } > > auto& extensions = context->getExtensions(); >- if (extensions.supports("GL_EXT_debug_marker"_s)) >- extensions.pushGroupMarkerEXT("WebGLRenderingContext"_s); >+ if (extensions.supports("GL_EXT_debug_marker"_s)) { } > > std::unique_ptr<WebGLRenderingContextBase> renderingContext; > #if ENABLE(WEBGL2) >diff --git a/Source/WebCore/platform/graphics/ExtensionsGL.h b/Source/WebCore/platform/graphics/ExtensionsGL.h >index 06c121127e22d13e6be386b8ebba76c67116a13d..033df15f41115248249d382e60af83245ade4097 100644 >--- a/Source/WebCore/platform/graphics/ExtensionsGL.h >+++ b/Source/WebCore/platform/graphics/ExtensionsGL.h >@@ -275,12 +275,6 @@ public: > // externally. > virtual GCGLint getGraphicsResetStatusARB() = 0; > >- // GL_ANGLE_framebuffer_blit >- virtual void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) = 0; >- >- // GL_ANGLE_framebuffer_multisample >- virtual void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) = 0; >- > // GL_OES_vertex_array_object > virtual PlatformGLObject createVertexArrayOES() = 0; > virtual void deleteVertexArrayOES(PlatformGLObject) = 0; >@@ -290,11 +284,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(void) = 0; >- > // GL_ARB_draw_buffers / GL_EXT_draw_buffers > virtual void drawBuffersEXT(GCGLSpan<const GCGLenum> bufs) = 0; > >@@ -303,48 +292,7 @@ public: > virtual void drawElementsInstanced(GCGLenum mode, GCGLsizei count, GCGLenum type, long long offset, GCGLsizei primcount) = 0; > virtual void vertexAttribDivisor(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 getInternalformativRobustANGLE(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLsizei bufSize, GCGLsizei* length, GCGLint* 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 readnPixelsRobustANGLE(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei* length, GCGLsizei* columns, GCGLsizei* rows, GCGLvoid* data, bool readingToPixelBufferObject) = 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) >@@ -353,18 +301,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; > #endif >- >- 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; >- > }; > > } // namespace WebCore >diff --git a/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp b/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp >index 283da82c6a602ea4b557c686cfd823d081c55e4a..345c266a4a06e02a81cfcfd287735d4a9e16187d 100644 >--- a/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp >+++ b/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp >@@ -43,31 +43,10 @@ typedef void* GLeglContext; > > namespace WebCore { > >-ExtensionsGLANGLE::ExtensionsGLANGLE(GraphicsContextGLOpenGL* context, bool useIndexedGetString) >+ExtensionsGLANGLE::ExtensionsGLANGLE(GraphicsContextGLOpenGL* context) > : m_initializedAvailableExtensions(false) > , m_context(context) >- , m_isNVIDIA(false) >- , m_isAMD(false) >- , m_isIntel(false) >- , m_isImagination(false) >- , m_requiresBuiltInFunctionEmulation(false) >- , m_requiresRestrictedMaximumTextureSize(false) >- , m_useIndexedGetString(useIndexedGetString) > { >- // FIXME: ideally, remove this initialization altogether. ANGLE >- // subsumes the responsibility for graphics driver workarounds. >- m_vendor = String(reinterpret_cast<const char*>(gl::GetString(GL_VENDOR))); >- m_renderer = String(reinterpret_cast<const char*>(gl::GetString(GL_RENDERER))); >- >- Vector<String> vendorComponents = m_vendor.convertToASCIILowercase().split(' '); >- if (vendorComponents.contains("nvidia")) >- m_isNVIDIA = true; >- if (vendorComponents.contains("ati") || vendorComponents.contains("amd")) >- m_isAMD = true; >- if (vendorComponents.contains("intel")) >- m_isIntel = true; >- if (vendorComponents.contains("imagination")) >- m_isImagination = true; > } > > ExtensionsGLANGLE::~ExtensionsGLANGLE() = default; >@@ -128,42 +107,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::blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long 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::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) >-{ >- if (!m_context->makeContextCurrent()) >- return; >- >- gl::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height); >-} >- > PlatformGLObject ExtensionsGLANGLE::createVertexArrayOES() > { > if (!m_context->makeContextCurrent()) >@@ -204,24 +156,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); >@@ -278,183 +212,6 @@ GCGLenum ExtensionsGLANGLE::adjustWebGL1TextureInternalFormat(GCGLenum internalf > } > > // 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::getInternalformativRobustANGLE(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) >-{ >- if (!m_context->makeContextCurrent()) >- return; >- >- gl::GetInternalformativRobustANGLE(target, internalformat, 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, int 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, int 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, int 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); >-} > > #if PLATFORM(MAC) || PLATFORM(IOS_FAMILY) > static void wipeAlphaChannelFromPixels(int width, int height, unsigned char* pixels) >@@ -504,120 +261,6 @@ void ExtensionsGLANGLE::readnPixelsRobustANGLE(int x, int y, GCGLsizei width, GC > #endif > } > >-void ExtensionsGLANGLE::getnUniformfvRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params) >-{ >- if (!m_context->makeContextCurrent()) >- return; >- >- gl::GetnUniformfvRobustANGLE(program, location, bufSize, length, params); >-} >- >-void ExtensionsGLANGLE::getnUniformivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params) >-{ >- if (!m_context->makeContextCurrent()) >- return; >- >- gl::GetnUniformivRobustANGLE(program, location, bufSize, length, params); >-} >- >-void ExtensionsGLANGLE::getnUniformuivRobustANGLE(GCGLuint program, int 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 a7731dfd20c5f03a335903faa6e38ff72f4b2323..057ff0c3abb5a93e13c47646643d9df3e68785c6 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); >+ ExtensionsGLANGLE(GraphicsContextGLOpenGL*); > virtual ~ExtensionsGLANGLE(); > > // ExtensionsGL methods. >@@ -49,71 +49,17 @@ 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 blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) override; >- void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) override; >- > void drawArraysInstanced(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount) override; > void drawElementsInstanced(GCGLenum mode, GCGLsizei count, GCGLenum type, long long offset, GCGLsizei primcount) override; > void vertexAttribDivisor(GCGLuint index, GCGLuint divisor) 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(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 getInternalformativRobustANGLE(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *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 readnPixelsRobustANGLE(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *data, bool readingToPixelBufferObject) 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); > >@@ -129,19 +75,6 @@ private: > > // Weak pointer back to GraphicsContextGLOpenGL. > GraphicsContextGLOpenGL* m_context; >- >- bool m_isNVIDIA; >- bool m_isAMD; >- bool m_isIntel; >- bool m_isImagination; >- bool m_requiresBuiltInFunctionEmulation; >- bool m_requiresRestrictedMaximumTextureSize; >- >- bool m_useIndexedGetString { false }; >- >- String m_vendor; >- String m_renderer; >- > // 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 7ec81cf4ae5772cae97288bc80e365646d627c7b..93630fd6d485a0b30098377f44d8dfc05cb4bbe0 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp >@@ -47,23 +47,6 @@ ExtensionsGLOpenGL::ExtensionsGLOpenGL(GraphicsContextGLOpenGL* context, bool us > > ExtensionsGLOpenGL::~ExtensionsGLOpenGL() = default; > >- >-void ExtensionsGLOpenGL::blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) >-{ >- if (!m_context->makeContextCurrent()) >- return; >- >- ::glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); >-} >- >-void ExtensionsGLOpenGL::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) >-{ >- if (!m_context->makeContextCurrent()) >- return; >- >- ::glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height); >-} >- > PlatformGLObject ExtensionsGLOpenGL::createVertexArrayOES() > { > if (!m_context->makeContextCurrent()) >@@ -127,24 +110,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 496289cea0e6a09d6db731f868b54993a44449a8..50b6fe3e943879389e094e7a54c3ab873efffb96 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 blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) override; >- void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long 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 drawArraysInstanced(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 43b5161fba778f8fb4384b1bc2db38ecf6c483eb..266dfceec87b824ca923e6c38bfd4837af958db2 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp >@@ -254,195 +254,11 @@ 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::getInternalformativRobustANGLE(GCGLenum, GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLint *) >-{ >- 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::readnPixelsRobustANGLE(int, int, GCGLsizei, GCGLsizei, GCGLenum, GCGLenum, GCGLsizei, GCGLsizei *, GCGLsizei *, GCGLsizei *, void *, bool) > { > 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 bfe4521543ff4b272137f344cee4a22d8fb28c64..845b3e7a254ec2078dba43efdd6932b807c81c91 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.h >@@ -55,60 +55,21 @@ 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; >+ 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() { return m_isNVIDIA; } >+ bool isAMD() { return m_isAMD; } >+ bool isIntel() { return m_isIntel; } >+ bool isImagination() { return m_isImagination; } >+ String vendor() { return m_vendor; } > >- bool requiresBuiltInFunctionEmulation() override { return m_requiresBuiltInFunctionEmulation; } >- bool requiresRestrictedMaximumTextureSize() override { return m_requiresRestrictedMaximumTextureSize; } >+ bool requiresBuiltInFunctionEmulation() { return m_requiresBuiltInFunctionEmulation; } >+ bool requiresRestrictedMaximumTextureSize() { 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 getInternalformativRobustANGLE(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *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 readnPixelsRobustANGLE(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *data, bool readingToPixelBufferObject) 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; >diff --git a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp >index 36c3ef38f98b99af011506991427bacefcbb8ac3..aab96874387d75297b07b70d89275b1cd3e08088 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::blitFramebuffer(long /* srcX0 */, long /* srcY0 */, long /* srcX1 */, long /* srcY1 */, long /* dstX0 */, long /* dstY0 */, long /* dstX1 */, long /* dstY1 */, unsigned long /* mask */, unsigned long /* filter */) >-{ >- notImplemented(); >-} >- > void ExtensionsGLOpenGLES::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) > { > if (!m_context->makeContextCurrent()) >@@ -115,21 +110,6 @@ void ExtensionsGLOpenGLES::renderbufferStorageMultisample(unsigned long 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 017a45b7398d0992ed14767f0767e04b46416283..7ef96b23c598681d1d80a1876c187bd13fa2175e 100644 >--- a/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h >+++ b/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h >@@ -72,14 +72,10 @@ public: > > virtual void framebufferTexture2DMultisampleIMG(unsigned long target, unsigned long attachment, unsigned long textarget, unsigned texture, int level, unsigned long samples); > virtual void renderbufferStorageMultisampleIMG(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height); >+ void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height); > > // Extension3D methods > bool isEnabled(const String&) override; >- void blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter) override; >- void renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height) override; >- void insertEventMarkerEXT(const String&) override; >- void pushGroupMarkerEXT(const String&) override; >- void popGroupMarkerEXT(void) override; > > PlatformGLObject createVertexArrayOES() override; > void deleteVertexArrayOES(PlatformGLObject) override; >diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp >index 6356f81f4821b6a1ea6c3557edf1f4e68813f6b9..f7ec577da92304e23e9079d8eea853c05a05f1b1 100644 >--- a/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp >+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp >@@ -66,7 +66,7 @@ void GraphicsContextGLOpenGL::readPixelsAndConvertToBGRAIfNecessary(int x, int y > auto attrs = contextAttributes(); > > // NVIDIA drivers have a bug where calling readPixels in BGRA can return the wrong values for the alpha channel when the alpha is off for the context. >- if (!attrs.alpha && getExtensions().isNVIDIA()) { >+ if (!attrs.alpha && static_cast<ExtensionsGLOpenGLCommon&>(getExtensions()).isNVIDIA()) { > ::glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); > #if USE(ACCELERATE) > vImage_Buffer src; >@@ -295,12 +295,12 @@ void GraphicsContextGLOpenGL::getIntegerv(GCGLenum pname, GCGLSpan<GCGLint> valu > #endif > case MAX_TEXTURE_SIZE: > ::glGetIntegerv(MAX_TEXTURE_SIZE, value.data); >- if (getExtensions().requiresRestrictedMaximumTextureSize()) >+ if (static_cast<ExtensionsGLOpenGLCommon&>(getExtensions()).requiresRestrictedMaximumTextureSize()) > *value = std::min(4096, *value); > break; > case MAX_CUBE_MAP_TEXTURE_SIZE: > ::glGetIntegerv(MAX_CUBE_MAP_TEXTURE_SIZE, value.data); >- if (getExtensions().requiresRestrictedMaximumTextureSize()) >+ if (static_cast<ExtensionsGLOpenGLCommon&>(getExtensions()).requiresRestrictedMaximumTextureSize()) > *value = std::min(1024, *value); > break; > default:
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=415338">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
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