<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167520] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167520">167520</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 17:29:45 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsExtensions3Dh">trunk/Source/WebCore/platform/graphics/Extensions3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommonh">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167519 => 167520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-18 23:45:33 UTC (rev 167519)
+++ trunk/Source/WebCore/ChangeLog 2014-04-19 00:29:45 UTC (rev 167520)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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).
+
</ins><span class="cx"> 2014-04-18 Hans Muller <hmuller@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Add parsing support for gradients
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsExtensions3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (167519 => 167520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-04-18 23:45:33 UTC (rev 167519)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2014-04-19 00:29:45 UTC (rev 167520)
</span><span class="lines">@@ -253,8 +253,10 @@
</span><span class="cx"> virtual bool maySupportMultisampling() = 0;
</span><span class="cx">
</span><span class="cx"> // Some configurations have bugs regarding built-in functions in their OpenGL drivers
</span><del>- // that must be avoided. Ports should implement this flag such configurations.
</del><ins>+ // that must be avoided. Ports should implement these flags on such configurations.
</ins><span class="cx"> virtual bool requiresBuiltInFunctionEmulation() = 0;
</span><ins>+ virtual bool requiresRestrictedMaximumTextureSize() = 0;
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (167519 => 167520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-04-18 23:45:33 UTC (rev 167519)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-04-19 00:29:45 UTC (rev 167520)
</span><span class="lines">@@ -60,8 +60,10 @@
</span><span class="cx"> , m_isImagination(false)
</span><span class="cx"> , m_maySupportMultisampling(true)
</span><span class="cx"> , m_requiresBuiltInFunctionEmulation(false)
</span><ins>+ , m_requiresRestrictedMaximumTextureSize(false)
</ins><span class="cx"> {
</span><span class="cx"> m_vendor = String(reinterpret_cast<const char*>(::glGetString(GL_VENDOR)));
</span><ins>+ m_renderer = String(reinterpret_cast<const char*>(::glGetString(GL_RENDERER)));
</ins><span class="cx">
</span><span class="cx"> Vector<String> vendorComponents;
</span><span class="cx"> m_vendor.lower().split(' ', vendorComponents);
</span><span class="lines">@@ -96,6 +98,10 @@
</span><span class="cx">
</span><span class="cx"> if (m_isAMD && !systemSupportsMultisampling)
</span><span class="cx"> m_maySupportMultisampling = false;
</span><ins>+
+ // Intel HD 3000 devices have problems with large textures. <rdar://problem/16649140>
+ if (m_isIntel)
+ m_requiresRestrictedMaximumTextureSize = m_renderer.startsWith("Intel HD Graphics 3000");
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h (167519 => 167520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2014-04-18 23:45:33 UTC (rev 167519)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2014-04-19 00:29:45 UTC (rev 167520)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool maySupportMultisampling() { return m_maySupportMultisampling; }
</span><span class="cx"> virtual bool requiresBuiltInFunctionEmulation() { return m_requiresBuiltInFunctionEmulation; }
</span><ins>+ virtual bool requiresRestrictedMaximumTextureSize() { return m_requiresRestrictedMaximumTextureSize; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> friend class Extensions3DOpenGLES;
</span><span class="lines">@@ -88,8 +89,10 @@
</span><span class="cx"> bool m_isImagination;
</span><span class="cx"> bool m_maySupportMultisampling;
</span><span class="cx"> bool m_requiresBuiltInFunctionEmulation;
</span><ins>+ bool m_requiresRestrictedMaximumTextureSize;
</ins><span class="cx">
</span><span class="cx"> String m_vendor;
</span><ins>+ String m_renderer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (167519 => 167520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-04-18 23:45:33 UTC (rev 167519)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2014-04-19 00:29:45 UTC (rev 167520)
</span><span class="lines">@@ -240,6 +240,16 @@
</span><span class="cx"> *value /= 4;
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+ 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;
</ins><span class="cx"> default:
</span><span class="cx"> ::glGetIntegerv(pname, value);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>