<!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>[209879] branches/safari-602-branch</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/209879">209879</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-12-15 15:12:31 -0800 (Thu, 15 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/204664">r204664</a>. rdar://problem/29690089</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchChangeLog">branches/safari-602-branch/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp">branches/safari-602-branch/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm">branches/safari-602-branch/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchManualTestswebglpreferLowPowerToHighPerformancehtml">branches/safari-602-branch/ManualTests/webgl-preferLowPowerToHighPerformance.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/ChangeLog (209878 => 209879)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/ChangeLog 2016-12-15 23:06:47 UTC (rev 209878)
+++ branches/safari-602-branch/ChangeLog 2016-12-15 23:12:31 UTC (rev 209879)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-12-15 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204664.
+
+ 2016-08-19 Dean Jackson <dino@apple.com>
+
+ Implement preferLowPowerToHighPerformance for WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=161017
+ <rdar://problem/26819135>
+
+ Reviewed by Myles Maxfield.
+
+ A manual test that creates contexts with and without preferLowPowerToHighPerformance
+ to see what is used. This has to be manual because it depends on the hardware
+ configuration, and we don't have a way to detect it up-front. Also, if the
+ code was failing, it would be the same result as on a single GPU system.
+
+ * ManualTests/webgl-preferLowPowerToHighPerformance.html: Added.
+
</ins><span class="cx"> 2016-10-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206119. rdar://problem/28964589
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (209878 => 209879)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-15 23:06:47 UTC (rev 209878)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-15 23:12:31 UTC (rev 209879)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-15 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204664.
+
+ 2016-08-19 Dean Jackson <dino@apple.com>
+
+ Implement preferLowPowerToHighPerformance for WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=161017
+ <rdar://problem/26819135>
+
+ Reviewed by Myles Maxfield.
+
+ Now that we implement preferLowPowerToHighPerformance we can
+ retain its value in the context creation attributes object.
+
+ * fast/canvas/webgl/context-creation-attributes-expected.txt:
+
</ins><span class="cx"> 2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r209149. rdar://problem/29404230
</span></span></pre></div>
<a id="branchessafari602branchManualTestswebglpreferLowPowerToHighPerformancehtmlfromrev204664trunkManualTestswebglpreferLowPowerToHighPerformancehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-602-branch/ManualTests/webgl-preferLowPowerToHighPerformance.html (from rev 204664, trunk/ManualTests/webgl-preferLowPowerToHighPerformance.html) (0 => 209879)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/ManualTests/webgl-preferLowPowerToHighPerformance.html (rev 0)
+++ branches/safari-602-branch/ManualTests/webgl-preferLowPowerToHighPerformance.html 2016-12-15 23:12:31 UTC (rev 209879)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<script>
+function createAndDescribeContext(msg, parameters)
+{
+ var canvas = document.createElement("canvas");
+ var gl = canvas.getContext("webgl", parameters);
+ var ext = gl.getExtension("WEBGL_debug_renderer_info");
+
+ var header = document.createElement("p");
+ header.textContent = msg;
+ document.body.appendChild(header);
+
+ var result = document.createElement("pre");
+ result.textContent = "UNMASKED_VENDOR_WEBGL is " + gl.getParameter(ext.UNMASKED_VENDOR_WEBGL) + "\n";
+ result.textContent += "UNMASKED_RENDERER_WEBGL is " + gl.getParameter(ext.UNMASKED_RENDERER_WEBGL);
+ document.body.appendChild(result);
+}
+
+function run()
+{
+ createAndDescribeContext("With preferLowPowerToHighPerformance", {preferLowPowerToHighPerformance: true});
+ createAndDescribeContext("Without preferLowPowerToHighPerformance", {});
+}
+
+window.addEventListener("load", run, false);
+</script>
+<p>
+ This is a manual test, since it relies on hardware configurations. It creates two
+ WebGL contexts. It first asks for a context with preferLowPowerToHighPerformance
+ set to true, and then for a context with the default value (false).
+</p>
+<p>
+ Unfortunately there isn't a completely reliable way to know if this test passed.
+ On a system with both an integrated and discrete GPU, assuming that the system
+ is configured to prefer the integrated GPU, and no other apps are running
+ that might cause the discrete GPU to be active, the two renderers should be different.
+ Also, if they are different, then the first one should be the lower power model
+ (i.e. the integrated card).
+</p>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (209878 => 209879)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-15 23:06:47 UTC (rev 209878)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-15 23:12:31 UTC (rev 209879)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-12-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204664.
+
+ 2016-08-19 Dean Jackson <dino@apple.com>
+
+ Implement preferLowPowerToHighPerformance for WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=161017
+ <rdar://problem/26819135>
+
+ Reviewed by Myles Maxfield.
+
+ Implement preferLowPowerToHighPerformance on macOS by
+ passing the correct CGL attribute when creating the
+ pixel format.
+
+ * bindings/js/JSHTMLCanvasElementCustom.cpp:
+ (WebCore::get3DContextAttributes):
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::setPixelFormat):
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
+2016-12-15 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r209819.
</span><span class="cx">
</span><span class="cx"> 2016-12-14 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp (209878 => 209879)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-12-15 23:06:47 UTC (rev 209878)
+++ branches/safari-602-branch/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-12-15 23:12:31 UTC (rev 209879)
</span><span class="lines">@@ -62,7 +62,8 @@
</span><span class="cx"> dictionary.tryGetProperty("antialias", graphicsAttrs.antialias);
</span><span class="cx"> dictionary.tryGetProperty("premultipliedAlpha", graphicsAttrs.premultipliedAlpha);
</span><span class="cx"> dictionary.tryGetProperty("preserveDrawingBuffer", graphicsAttrs.preserveDrawingBuffer);
</span><del>-
</del><ins>+ dictionary.tryGetProperty("preferLowPowerToHighPerformance", graphicsAttrs.preferLowPowerToHighPerformance);
+
</ins><span class="cx"> attrs = WebGLContextAttributes::create(graphicsAttrs);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (209878 => 209879)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2016-12-15 23:06:47 UTC (rev 209878)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2016-12-15 23:12:31 UTC (rev 209879)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest, bool antialias)
</del><ins>+static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest, bool antialias, bool allowOffline)
</ins><span class="cx"> {
</span><span class="cx"> attribs.clear();
</span><span class="cx">
</span><span class="lines">@@ -92,7 +92,14 @@
</span><span class="cx"> attribs.append(static_cast<CGLPixelFormatAttribute>(colorBits));
</span><span class="cx"> attribs.append(kCGLPFADepthSize);
</span><span class="cx"> attribs.append(static_cast<CGLPixelFormatAttribute>(depthBits));
</span><del>-
</del><ins>+
+ // This attribute, while mentioning offline renderers, is actually
+ // allowing us to request the integrated graphics on a dual GPU
+ // system, and not force the discrete GPU.
+ // See https://developer.apple.com/library/mac/technotes/tn2229/_index.html
+ if (allowOffline)
+ attribs.append(kCGLPFAAllowOfflineRenderers);
+
</ins><span class="cx"> if (accelerated)
</span><span class="cx"> attribs.append(kCGLPFAAccelerated);
</span><span class="cx"> else {
</span><span class="lines">@@ -191,22 +198,22 @@
</span><span class="cx"> // If none of that works, we simply fail and set m_contextObj to 0.
</span><span class="cx">
</span><span class="cx"> bool useMultisampling = m_attrs.antialias;
</span><del>-
- setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, true, false, useMultisampling);
</del><ins>+
+ setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, true, false, useMultisampling, attrs.preferLowPowerToHighPerformance);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><span class="cx">
</span><del>- if (numPixelFormats == 0) {
- setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, false, false, useMultisampling);
</del><ins>+ if (!numPixelFormats) {
+ setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, false, false, useMultisampling, attrs.preferLowPowerToHighPerformance);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><span class="cx">
</span><del>- if (numPixelFormats == 0) {
- setPixelFormat(attribs, 32, 16, !attrs.forceSoftwareRenderer, false, false, useMultisampling);
</del><ins>+ if (!numPixelFormats) {
+ setPixelFormat(attribs, 32, 16, !attrs.forceSoftwareRenderer, false, false, useMultisampling, attrs.preferLowPowerToHighPerformance);
</ins><span class="cx"> CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
</span><span class="cx">
</span><del>- if (!attrs.forceSoftwareRenderer && numPixelFormats == 0) {
- setPixelFormat(attribs, 32, 16, false, false, true, false);
- CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
- useMultisampling = false;
</del><ins>+ if (!attrs.forceSoftwareRenderer && !numPixelFormats) {
+ setPixelFormat(attribs, 32, 16, false, false, true, false, false);
+ CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
+ useMultisampling = false;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>