<!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>[161294] 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/161294">161294</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-03 16:20:27 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] CGLPixelFormat should specify SampleBuffer and Sample count when using MSAA
https://bugs.webkit.org/show_bug.cgi?id=126468
Reviewed by Dean Jackson.
Covered by webgl/1.0.2/resources/webgl_test_files/conformance/rendering/gl-scissor-test.html
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::setPixelFormat): Add kCGLPFAMultisample, kCGLPFASampleBuffers (and count), and
kCGLPFASamples (and count) to our pixel format when 'antialias=true'.
(WebCore::GraphicsContext3D::GraphicsContext3D): Pass a new 'antialias' flag to the setPixelFormat
method so we can turn on MSAA features when needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm">trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161293 => 161294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-04 00:15:12 UTC (rev 161293)
+++ trunk/Source/WebCore/ChangeLog 2014-01-04 00:20:27 UTC (rev 161294)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-03 Brent Fulgham <bfulgham@apple.com>
+
+ [WebGL] CGLPixelFormat should specify SampleBuffer and Sample count when using MSAA
+ https://bugs.webkit.org/show_bug.cgi?id=126468
+
+ Reviewed by Dean Jackson.
+
+ Covered by webgl/1.0.2/resources/webgl_test_files/conformance/rendering/gl-scissor-test.html
+
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::setPixelFormat): Add kCGLPFAMultisample, kCGLPFASampleBuffers (and count), and
+ kCGLPFASamples (and count) to our pixel format when 'antialias=true'.
+ (WebCore::GraphicsContext3D::GraphicsContext3D): Pass a new 'antialias' flag to the setPixelFormat
+ method so we can turn on MSAA features when needed.
+
</ins><span class="cx"> 2014-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Give all PlatformCALayers a PlatformLayerID, not just remote ones
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (161293 => 161294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-01-04 00:15:12 UTC (rev 161293)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-01-04 00:20:27 UTC (rev 161294)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> ~GraphicsContext3DPrivate() { }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest)
</del><ins>+static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest, bool antialias)
</ins><span class="cx"> {
</span><span class="cx"> attribs.clear();
</span><span class="cx">
</span><span class="lines">@@ -77,11 +77,19 @@
</span><span class="cx"> attribs.append(static_cast<CGLPixelFormatAttribute>(kCGLRendererGenericFloatID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (supersample)
</del><ins>+ if (supersample && !antialias)
</ins><span class="cx"> attribs.append(kCGLPFASupersample);
</span><span class="cx">
</span><span class="cx"> if (closest)
</span><span class="cx"> attribs.append(kCGLPFAClosestPolicy);
</span><ins>+
+ if (antialias) {
+ attribs.append(kCGLPFAMultisample);
+ attribs.append(kCGLPFASampleBuffers);
+ attribs.append(static_cast<CGLPixelFormatAttribute>(1));
+ attribs.append(kCGLPFASamples);
+ attribs.append(static_cast<CGLPixelFormatAttribute>(4));
+ }
</ins><span class="cx">
</span><span class="cx"> attribs.append(static_cast<CGLPixelFormatAttribute>(0));
</span><span class="cx"> }
</span><span class="lines">@@ -132,20 +140,23 @@
</span><span class="cx"> //
</span><span class="cx"> // If none of that works, we simply fail and set m_contextObj to 0.
</span><span class="cx">
</span><del>- setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, true, false);
</del><ins>+ bool useMultisampling = m_attrs.antialias;
+
+ setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, true, false, useMultisampling);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><span class="cx">
</span><span class="cx"> if (numPixelFormats == 0) {
</span><del>- setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, false, false);
</del><ins>+ setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, false, false, useMultisampling);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><span class="cx">
</span><span class="cx"> if (numPixelFormats == 0) {
</span><del>- setPixelFormat(attribs, 32, 16, !attrs.forceSoftwareRenderer, false, false);
</del><ins>+ setPixelFormat(attribs, 32, 16, !attrs.forceSoftwareRenderer, false, false, useMultisampling);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><span class="cx">
</span><span class="cx"> if (!attrs.forceSoftwareRenderer && numPixelFormats == 0) {
</span><del>- setPixelFormat(attribs, 32, 16, false, false, true);
</del><ins>+ setPixelFormat(attribs, 32, 16, false, false, true, false);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><ins>+ useMultisampling = false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -183,6 +194,9 @@
</span><span class="cx"> [m_webGLLayer.get() setName:@"WebGL Layer"];
</span><span class="cx"> #endif
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><ins>+
+ if (useMultisampling)
+ ::glEnable(GL_MULTISAMPLE);
</ins><span class="cx">
</span><span class="cx"> // create a texture to render into
</span><span class="cx"> ::glGenTextures(1, &m_texture);
</span></span></pre>
</div>
</div>
</body>
</html>