diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp index 98e1145b3..d7c05e627 100644 --- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp +++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp @@ -49,6 +49,12 @@ namespace WebCore { +void GraphicsContext3D::releaseShaderCompiler() +{ + makeContextCurrent(); + notImplemented(); +} + void GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels) { ::glReadPixels(x, y, width, height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, pixels); @@ -59,13 +65,7 @@ void GraphicsContext3D::validateAttributes() Extensions3D* extensions = getExtensions(); validateDepthStencil("GL_EXT_packed_depth_stencil"); if (m_attrs.antialias) { - bool isValidVendor = true; - // Currently in Mac we only turn on antialias if vendor is NVIDIA, - // or if ATI and on 10.7.2 and above. - const char* vendor = reinterpret_cast<const char*>(::glGetString(GL_VENDOR)); - if (!vendor || (!std::strstr(vendor, "NVIDIA") && !(std::strstr(vendor, "ATI") && systemAllowsMultisamplingOnATICards()))) - isValidVendor = false; - if (!isValidVendor || !extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant()) + if (!extensions->maySupportMultisampling() || !extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant()) m_attrs.antialias = false; else extensions->ensureEnabled("GL_ANGLE_framebuffer_multisample"); @@ -281,26 +281,6 @@ void GraphicsContext3D::clearDepth(GC3Dclampf depth) ::glClearDepth(depth); } -bool GraphicsContext3D::systemAllowsMultisamplingOnATICards() const -{ -#if PLATFORM(MAC) -#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 - return true; -#else - ASSERT(isMainThread()); - static SInt32 version; - if (!version) { - if (Gestalt(gestaltSystemVersion, &version) != noErr) - return false; - } - // See https://bugs.webkit.org/show_bug.cgi?id=77922 for more details - return version >= 0x1072; -#endif // SNOW_LEOPARD and LION -#else - return false; -#endif // PLATFORM(MAC) -} - Extensions3D* GraphicsContext3D::getExtensions() { if (!m_extensions) |