<!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>[188536] 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/188536">188536</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-17 13:19:55 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused multisampling check
https://bugs.webkit.org/show_bug.cgi?id=148030
Patch by Alex Christensen <achristensen@webkit.org> on 2015-08-17
Reviewed by Dean Jackson.
No change in behavior.
Extensions3DOpenGLCommon.m_maySupportMultisampling is always true.
* platform/graphics/Extensions3D.h:
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
* platform/graphics/opengl/Extensions3DOpenGLCommon.h:
(WebCore::Extensions3DOpenGLCommon::isImagination):
(WebCore::Extensions3DOpenGLCommon::vendor):
(WebCore::Extensions3DOpenGLCommon::requiresBuiltInFunctionEmulation):
(WebCore::Extensions3DOpenGLCommon::requiresRestrictedMaximumTextureSize):
(WebCore::Extensions3DOpenGLCommon::maySupportMultisampling): Deleted.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::validateDepthStencil):</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="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188535 => 188536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/ChangeLog 2015-08-17 20:19:55 UTC (rev 188536)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-08-17 Alex Christensen <achristensen@webkit.org>
+
+ Remove unused multisampling check
+ https://bugs.webkit.org/show_bug.cgi?id=148030
+
+ Reviewed by Dean Jackson.
+
+ No change in behavior.
+ Extensions3DOpenGLCommon.m_maySupportMultisampling is always true.
+
+ * platform/graphics/Extensions3D.h:
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.h:
+ (WebCore::Extensions3DOpenGLCommon::isImagination):
+ (WebCore::Extensions3DOpenGLCommon::vendor):
+ (WebCore::Extensions3DOpenGLCommon::requiresBuiltInFunctionEmulation):
+ (WebCore::Extensions3DOpenGLCommon::requiresRestrictedMaximumTextureSize):
+ (WebCore::Extensions3DOpenGLCommon::maySupportMultisampling): Deleted.
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::validateDepthStencil):
+
</ins><span class="cx"> 2015-08-17 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188486): Crash in SubresourceLoader::didReceiveResponse() when TemporaryChange goes out of scope
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsExtensions3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (188535 => 188536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2015-08-17 20:19:55 UTC (rev 188536)
</span><span class="lines">@@ -255,13 +255,6 @@
</span><span class="cx"> virtual bool isImagination() = 0;
</span><span class="cx"> virtual String vendor() = 0;
</span><span class="cx">
</span><del>- // If this method returns false then the system *definitely* does not support multisampling.
- // It does not necessarily say the system does support it - callers must attempt to construct
- // multisampled renderbuffers and check framebuffer completeness.
- // Ports should implement this to return false on configurations where it is known
- // that multisampling is not available.
- virtual bool maySupportMultisampling() = 0;
-
</del><span class="cx"> // Some configurations have bugs regarding built-in functions in their OpenGL drivers
</span><span class="cx"> // that must be avoided. Ports should implement these flags on such configurations.
</span><span class="cx"> virtual bool requiresBuiltInFunctionEmulation() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (188535 => 188536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-08-17 20:19:55 UTC (rev 188536)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> , m_isAMD(false)
</span><span class="cx"> , m_isIntel(false)
</span><span class="cx"> , m_isImagination(false)
</span><del>- , m_maySupportMultisampling(true)
</del><span class="cx"> , m_requiresBuiltInFunctionEmulation(false)
</span><span class="cx"> , m_requiresRestrictedMaximumTextureSize(false)
</span><span class="cx"> {
</span><span class="lines">@@ -80,17 +79,8 @@
</span><span class="cx"> if (m_isAMD || m_isIntel)
</span><span class="cx"> m_requiresBuiltInFunctionEmulation = true;
</span><span class="cx">
</span><del>- // Currently in Mac we only allow multisampling if the vendor is NVIDIA,
- // or if the vendor is AMD/ATI and the system is 10.7.2 and above.
-
- bool systemSupportsMultisampling = true;
-
- if (m_isAMD && !systemSupportsMultisampling)
- m_maySupportMultisampling = false;
-
</del><span class="cx"> // Intel HD 3000 devices have problems with large textures. <rdar://problem/16649140>
</span><del>- if (m_isIntel)
- m_requiresRestrictedMaximumTextureSize = m_renderer.startsWith("Intel HD Graphics 3000");
</del><ins>+ 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 (188535 => 188536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2015-08-17 20:19:55 UTC (rev 188536)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> virtual bool isImagination() { return m_isImagination; }
</span><span class="cx"> virtual String vendor() { return m_vendor; }
</span><span class="cx">
</span><del>- virtual bool maySupportMultisampling() { return m_maySupportMultisampling; }
</del><span class="cx"> virtual bool requiresBuiltInFunctionEmulation() { return m_requiresBuiltInFunctionEmulation; }
</span><span class="cx"> virtual bool requiresRestrictedMaximumTextureSize() { return m_requiresRestrictedMaximumTextureSize; }
</span><span class="cx">
</span><span class="lines">@@ -87,7 +86,6 @@
</span><span class="cx"> bool m_isAMD;
</span><span class="cx"> bool m_isIntel;
</span><span class="cx"> bool m_isImagination;
</span><del>- bool m_maySupportMultisampling;
</del><span class="cx"> bool m_requiresBuiltInFunctionEmulation;
</span><span class="cx"> bool m_requiresRestrictedMaximumTextureSize;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (188535 => 188536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-08-17 20:19:55 UTC (rev 188536)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> m_attrs.stencil = false;
</span><span class="cx"> }
</span><span class="cx"> if (m_attrs.antialias) {
</span><del>- if (!extensions->maySupportMultisampling() || !extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
</del><ins>+ if (!extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
</ins><span class="cx"> m_attrs.antialias = false;
</span><span class="cx"> else
</span><span class="cx"> extensions->ensureEnabled("GL_ANGLE_framebuffer_multisample");
</span></span></pre>
</div>
</div>
</body>
</html>