<!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>[197008] trunk</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/197008">197008</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-02-23 17:21:55 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] iOS doesn't respect the alpha:false context creation attribute
https://bugs.webkit.org/show_bug.cgi?id=154617
<rdar://problem/13417023>
Reviewed by Sam Weinig.
Source/WebCore:
On iOS we were not respecting the alpha:false context creation
attribute, which meant you always got output that could
have an alpha channel.
The good news is that now we're setting the opaque flag on
the CALayer, there should be a performance improvement when
compositing WebGL into the page.
Test: fast/canvas/webgl/context-attributes-alpha.html
* platform/graphics/mac/GraphicsContext3DMac.mm:
(WebCore::GraphicsContext3D::GraphicsContext3D): Don't tell the layer
to be transparent.
(WebCore::GraphicsContext3D::setRenderbufferStorageFromDrawable): Do it
here instead, but based on the value of the alpha attribute.
LayoutTests:
Add a test that draws contexts with and without alpha, and then a reference
version that hard-codes the non-alpha colors.
* fast/canvas/webgl/context-attributes-alpha-expected.html: Added.
* fast/canvas/webgl/context-attributes-alpha.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvaswebglcontextattributesalphaexpectedhtml">trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglcontextattributesalphahtml">trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197007 => 197008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-24 00:53:29 UTC (rev 197007)
+++ trunk/LayoutTests/ChangeLog 2016-02-24 01:21:55 UTC (rev 197008)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-23 Dean Jackson <dino@apple.com>
+
+ [WebGL] iOS doesn't respect the alpha:false context creation attribute
+ https://bugs.webkit.org/show_bug.cgi?id=154617
+ <rdar://problem/13417023>
+
+ Reviewed by Sam Weinig.
+
+ Add a test that draws contexts with and without alpha, and then a reference
+ version that hard-codes the non-alpha colors.
+
+ * fast/canvas/webgl/context-attributes-alpha-expected.html: Added.
+ * fast/canvas/webgl/context-attributes-alpha.html: Added.
+
</ins><span class="cx"> 2016-02-23 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Enable base-uri directive by default
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglcontextattributesalphaexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-expected.html (0 => 197008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-expected.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-expected.html 2016-02-24 01:21:55 UTC (rev 197008)
</span><span class="lines">@@ -0,0 +1,98 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<meta name="viewport" content="width=device-width">
+<style>
+body {
+ margin: 0;
+ background-size: 100px 100px;
+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"><rect width="0.5" height="0.5" fill="blue"/><rect x="0.5" y="0.5" width="0.5" height="0.5" fill="orange"/><rect x="0" y="0.5" width="0.5" height="0.5" fill="yellow"/><rect x="0.5" y="0" width="0.5" height="0.5" fill="pink"/></svg>');
+}
+canvas {
+ width: 200px;
+ height: 200px;
+}
+</style>
+</head>
+<script id="vertexShaderSource" type="text/glsl">
+attribute vec4 position;
+void main() {
+ gl_Position = position;
+}
+</script>
+<script id="fragmentShaderSource1" type="text/glsl">
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+void main() {
+ gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
+}
+</script>
+<script id="fragmentShaderSource2" type="text/glsl">
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+void main() {
+ gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}
+</script>
+<script>
+
+function drawTriangle(canvas, alpha) {
+ canvas.width = 200;
+ canvas.height = 200;
+ var gl = canvas.getContext("webgl", { alpha: true });
+ var vertexShader = gl.createShader(gl.VERTEX_SHADER);
+ gl.shaderSource(vertexShader, document.getElementById("vertexShaderSource").textContent);
+ gl.compileShader(vertexShader);
+ if (!gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS)) {
+ console.error("Vertex Shader failed to compile.");
+ console.log(gl.getShaderInfoLog(vertexShader));
+ return;
+ }
+ var fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
+ var fragmentShaderSourceID = "fragmentShaderSource" + (alpha ? "1" : "2");
+ gl.shaderSource(fragmentShader, document.getElementById(fragmentShaderSourceID).textContent);
+ gl.compileShader(fragmentShader);
+ if (!gl.getShaderParameter(fragmentShader, gl.COMPILE_STATUS)) {
+ console.error("Fragment Shader failed to compile.");
+ console.log(gl.getShaderInfoLog(fragmentShader));
+ return;
+ }
+ var program = gl.createProgram();
+ gl.attachShader(program, vertexShader);
+ gl.attachShader(program, fragmentShader);
+ gl.linkProgram(program);
+
+ if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+ console.error("Unable to link shaders into program.");
+ return;
+ }
+ gl.useProgram(program);
+ var positionAttribute = gl.getAttribLocation(program, "position");
+ gl.enableVertexAttribArray(positionAttribute);
+ var vertices = new Float32Array([
+ -0.5, -0.5,
+ 0.5, -0.5,
+ 0, 0.5
+ ]);
+ var triangleBuffer = gl.createBuffer();
+ gl.bindBuffer(gl.ARRAY_BUFFER, triangleBuffer);
+ gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW);
+ gl.clearColor(0, 1, 0, alpha ? 0.5 : 1.0);
+ gl.clear(gl.COLOR_BUFFER_BIT);
+ gl.bindBuffer(gl.ARRAY_BUFFER, triangleBuffer);
+ gl.vertexAttribPointer(positionAttribute, 2, gl.FLOAT, false, 0, 0);
+ gl.drawArrays(gl.TRIANGLES, 0, 3);
+}
+
+window.addEventListener("load", function () {
+ var canvases = document.querySelectorAll("canvas");
+ drawTriangle(canvases[0], true);
+ drawTriangle(canvases[1], false);
+}, false);
+</script>
+<body>
+ <canvas></canvas><canvas></canvas>
+</body>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcanvaswebglcontextattributesalphahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha.html (0 => 197008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha.html 2016-02-24 01:21:55 UTC (rev 197008)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<meta name="viewport" content="width=device-width">
+<style>
+body {
+ margin: 0;
+ background-size: 100px 100px;
+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"><rect width="0.5" height="0.5" fill="blue"/><rect x="0.5" y="0.5" width="0.5" height="0.5" fill="orange"/><rect x="0" y="0.5" width="0.5" height="0.5" fill="yellow"/><rect x="0.5" y="0" width="0.5" height="0.5" fill="pink"/></svg>');
+}
+canvas {
+ width: 200px;
+ height: 200px;
+}
+</style>
+</head>
+<script id="vertexShaderSource" type="text/glsl">
+attribute vec4 position;
+void main() {
+ gl_Position = position;
+}
+</script>
+<script id="fragmentShaderSource" type="text/glsl">
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+void main() {
+ gl_FragColor = vec4(1.0, 0.0, 0.0, 0.5);
+}
+</script>
+<script>
+
+function drawTriangle(canvas, alpha) {
+ canvas.width = 200;
+ canvas.height = 200;
+ var gl = canvas.getContext("webgl", { alpha: alpha });
+ var vertexShader = gl.createShader(gl.VERTEX_SHADER);
+ gl.shaderSource(vertexShader, document.getElementById("vertexShaderSource").textContent);
+ gl.compileShader(vertexShader);
+ if (!gl.getShaderParameter(vertexShader, gl.COMPILE_STATUS)) {
+ console.error("Vertex Shader failed to compile.");
+ console.log(gl.getShaderInfoLog(vertexShader));
+ return;
+ }
+ var fragmentShader = gl.createShader(gl.FRAGMENT_SHADER);
+ gl.shaderSource(fragmentShader, document.getElementById("fragmentShaderSource").textContent);
+ gl.compileShader(fragmentShader);
+ if (!gl.getShaderParameter(fragmentShader, gl.COMPILE_STATUS)) {
+ console.error("Fragment Shader failed to compile.");
+ console.log(gl.getShaderInfoLog(fragmentShader));
+ return;
+ }
+ var program = gl.createProgram();
+ gl.attachShader(program, vertexShader);
+ gl.attachShader(program, fragmentShader);
+ gl.linkProgram(program);
+
+ if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+ console.error("Unable to link shaders into program.");
+ return;
+ }
+ gl.useProgram(program);
+ var positionAttribute = gl.getAttribLocation(program, "position");
+ gl.enableVertexAttribArray(positionAttribute);
+ var vertices = new Float32Array([
+ -0.5, -0.5,
+ 0.5, -0.5,
+ 0, 0.5
+ ]);
+ var triangleBuffer = gl.createBuffer();
+ gl.bindBuffer(gl.ARRAY_BUFFER, triangleBuffer);
+ gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW);
+ gl.clearColor(0, 1, 0, 0.5);
+ gl.clear(gl.COLOR_BUFFER_BIT);
+ gl.bindBuffer(gl.ARRAY_BUFFER, triangleBuffer);
+ gl.vertexAttribPointer(positionAttribute, 2, gl.FLOAT, false, 0, 0);
+ gl.drawArrays(gl.TRIANGLES, 0, 3);
+}
+
+window.addEventListener("load", function () {
+ var canvases = document.querySelectorAll("canvas");
+ drawTriangle(canvases[0], true);
+ drawTriangle(canvases[1], false);
+}, false);
+</script>
+<body>
+ <canvas></canvas><canvas></canvas>
+</body>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197007 => 197008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-24 00:53:29 UTC (rev 197007)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 01:21:55 UTC (rev 197008)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-02-23 Dean Jackson <dino@apple.com>
+
+ [WebGL] iOS doesn't respect the alpha:false context creation attribute
+ https://bugs.webkit.org/show_bug.cgi?id=154617
+ <rdar://problem/13417023>
+
+ Reviewed by Sam Weinig.
+
+ On iOS we were not respecting the alpha:false context creation
+ attribute, which meant you always got output that could
+ have an alpha channel.
+
+ The good news is that now we're setting the opaque flag on
+ the CALayer, there should be a performance improvement when
+ compositing WebGL into the page.
+
+ Test: fast/canvas/webgl/context-attributes-alpha.html
+
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3D::GraphicsContext3D): Don't tell the layer
+ to be transparent.
+ (WebCore::GraphicsContext3D::setRenderbufferStorageFromDrawable): Do it
+ here instead, but based on the value of the alpha attribute.
+
</ins><span class="cx"> 2016-02-23 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Enable base-uri directive by default
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGraphicsContext3DMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (197007 => 197008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2016-02-24 00:53:29 UTC (rev 197007)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2016-02-24 01:21:55 UTC (rev 197008)
</span><span class="lines">@@ -227,9 +227,6 @@
</span><span class="cx"> // Create the WebGLLayer
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> m_webGLLayer = adoptNS([[WebGLLayer alloc] initWithGraphicsContext3D:this]);
</span><del>-#if PLATFORM(IOS)
- [m_webGLLayer setOpaque:0];
-#endif
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> [m_webGLLayer setName:@"WebGL Layer"];
</span><span class="cx"> #endif
</span><span class="lines">@@ -345,7 +342,9 @@
</span><span class="cx"> bool GraphicsContext3D::setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height)
</span><span class="cx"> {
</span><span class="cx"> [m_webGLLayer setBounds:CGRectMake(0, 0, width, height)];
</span><del>- return [m_contextObj renderbufferStorage:GL_RENDERBUFFER fromDrawable:static_cast<NSObject<EAGLDrawable>*>(m_webGLLayer.get())];
</del><ins>+ [m_webGLLayer setOpaque:(m_internalColorFormat != GL_RGBA8)];
+
+ return [m_contextObj renderbufferStorage:GL_RENDERBUFFER fromDrawable:static_cast<id<EAGLDrawable>>(m_webGLLayer.get())];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>