Changeset 167520 in webkit

Timestamp:

Apr 18, 2014 5:29:45 PM (10 years ago)

Author:

dino@apple.com

Message:

[WebGL] Limit maximum texture sizes on older Intel hardware
​https://bugs.webkit.org/show_bug.cgi?id=131867

Reviewed by Geoffrey Garen.

Both Chrome and Firefox limit the MAX_TEXTURE_SIZE on
older Intel hardware to be at most 4096. This does the
same for WebKit.

• platform/graphics/Extensions3D.h: Add requiresRestrictedMaximumTextureSize() accessor.
• platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:

(WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon): Record the value of GL_RENDERER
and test for "Intel HD Graphics 3000", which is the problematic hardware.

• platform/graphics/opengl/Extensions3DOpenGLCommon.h:

(WebCore::Extensions3DOpenGLCommon::requiresRestrictedMaximumTextureSize): Getter.

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::getIntegerv): If you're asking for MAX_TEXTURE_SIZE or
MAX_CUBE_MAP_TEXTURE_SIZE, and you're on problematic hardware, return a clamped value
(4096 and 1024 respectively).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Extensions3D.h (modified) (1 diff)
• platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (modified) (2 diffs)
• platform/graphics/opengl/Extensions3DOpenGLCommon.h (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-18  Dean Jackson  <dino@apple.com>
+
+        [WebGL] Limit maximum texture sizes on older Intel hardware
+        https://bugs.webkit.org/show_bug.cgi?id=131867
+
+        Reviewed by Geoffrey Garen.
+
+        Both Chrome and Firefox limit the MAX_TEXTURE_SIZE on
+        older Intel hardware to be at most 4096. This does the
+        same for WebKit.
+
+        * platform/graphics/Extensions3D.h: Add requiresRestrictedMaximumTextureSize() accessor.
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+        (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon): Record the value of GL_RENDERER
+        and test for "Intel HD Graphics 3000", which is the problematic hardware.
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.h:
+        (WebCore::Extensions3DOpenGLCommon::requiresRestrictedMaximumTextureSize): Getter.
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::getIntegerv): If you're asking for MAX_TEXTURE_SIZE or
+        MAX_CUBE_MAP_TEXTURE_SIZE, and you're on problematic hardware, return a clamped value
+        (4096 and 1024 respectively).
+
 2014-04-18  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/platform/graphics/Extensions3D.h

@@ -254 +254 @@
 
     // Some configurations have bugs regarding built-in functions in their OpenGL drivers
-    // that must be avoided. Ports should implement this flag such configurations.
+    // that must be avoided. Ports should implement these flags on such configurations.
     virtual bool requiresBuiltInFunctionEmulation() = 0;
+    virtual bool requiresRestrictedMaximumTextureSize() = 0;
+
 };
 

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp

@@ -61 +61 @@
     , m_maySupportMultisampling(true)
     , m_requiresBuiltInFunctionEmulation(false)
+    , m_requiresRestrictedMaximumTextureSize(false)
 {
     m_vendor = String(reinterpret_cast<const char*>(::glGetString(GL_VENDOR)));
+    m_renderer = String(reinterpret_cast<const char*>(::glGetString(GL_RENDERER)));
 
     Vector<String> vendorComponents;
@@ -97 +99 @@
     if (m_isAMD && !systemSupportsMultisampling)
         m_maySupportMultisampling = false;
+
+    // Intel HD 3000 devices have problems with large textures. <rdar://problem/16649140>
+    if (m_isIntel)
+        m_requiresRestrictedMaximumTextureSize = m_renderer.startsWith("Intel HD Graphics 3000");
 #endif
 }

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h

@@ -68 +68 @@
     virtual bool maySupportMultisampling() { return m_maySupportMultisampling; }
     virtual bool requiresBuiltInFunctionEmulation() { return m_requiresBuiltInFunctionEmulation; }
+    virtual bool requiresRestrictedMaximumTextureSize() { return m_requiresRestrictedMaximumTextureSize; }
 
 protected:
@@ -89 +90 @@
     bool m_maySupportMultisampling;
     bool m_requiresBuiltInFunctionEmulation;
+    bool m_requiresRestrictedMaximumTextureSize;
 
     String m_vendor;
+    String m_renderer;
 };
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

@@ -241 +241 @@
         break;
 #endif
+    case MAX_TEXTURE_SIZE:
+        ::glGetIntegerv(MAX_TEXTURE_SIZE, value);
+        if (getExtensions()->requiresRestrictedMaximumTextureSize())
+            *value = std::min(4096, *value);
+        break;
+    case MAX_CUBE_MAP_TEXTURE_SIZE:
+        ::glGetIntegerv(MAX_CUBE_MAP_TEXTURE_SIZE, value);
+        if (getExtensions()->requiresRestrictedMaximumTextureSize())
+            *value = std::min(1024, *value);
+        break;
     default:
         ::glGetIntegerv(pname, value);