<!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>[160199] 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/160199">160199</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2013-12-05 15:45:28 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] Make sure we satisfy uniform and varying packing restrictions.
https://bugs.webkit.org/show_bug.cgi?id=125124.
<rdar://problem/15203291>
Reviewed by Brent Fulgham.
Tests covered by WebGL Khronos conformance tests:
webgl/1.0.2/conformance/glsl/misc/shader-uniform-packing-restrictions.html
webgl/1.0.2/conformance/glsl/misc/shader-varying-packing-restrictions.html
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
* src/compiler/Compiler.cpp:
Add a check to enforcePackingRestrictions to ensure we make sure packing restrictions for varyings are satisfied as well.
(TCompiler::TCompiler):
(TCompiler::Init):
(TCompiler::compile):
(TCompiler::enforcePackingRestrictions):
* src/compiler/ShHandle.h: Keep track of maximum varying vectors.
* platform/mac/TestExpectations: Unskip some 1.0.2 WebGL conformance tests that should now be passing.
Skip conformance/ogles/GL/build/build_009_to_016.html which is a faulty test and has too many varyings in one shader.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilerCompilercpp">trunk/Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp</a></li>
<li><a href="#trunkSourceThirdPartyANGLEsrccompilerShHandleh">trunk/Source/ThirdParty/ANGLE/src/compiler/ShHandle.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/LayoutTests/ChangeLog 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-05 Roger Fong <roger_fong@apple.com>
+
+ [WebGL] Make sure we satisfy uniform and varying packing restrictions.
+ https://bugs.webkit.org/show_bug.cgi?id=125124.
+ <rdar://problem/15203291>
+
+ Reviewed by Brent Fulgham.
+
+ * platform/mac/TestExpectations: Unskip some 1.0.2 WebGL conformance tests that should now be passing.
+ Skip conformance/ogles/GL/build/build_009_to_016.html which is a faulty test and has too many varyings in one shader.
+
</ins><span class="cx"> 2013-12-05 Alexandru Chiculita <achicu@adobe.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: [CSS Regions] Show a list of containing regions when clicking a node that is part of a flow
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -695,11 +695,8 @@
</span><span class="cx">
</span><span class="cx"> # Currently working on 1.0.2 conformance, skip currently known failing tests, <rdar://problem/12099869>
</span><span class="cx"> webgl/1.0.2/conformance/glsl/misc/shader-with-too-many-uniforms.html [ Failure ]
</span><del>-webgl/1.0.2/conformance/extensions/webgl-compressed-texture-s3tc.html [ Failure ]
-webgl/1.0.2/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Failure Timeout ]
-webgl/1.0.2/conformance/glsl/misc/shader-varying-packing-restrictions.html [ Failure ]
</del><ins>+webgl/1.0.2/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Timeout ]
</ins><span class="cx"> webgl/1.0.2/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html [ Failure ]
</span><del>-webgl/1.0.2/conformance/glsl/misc/shader-with-short-circuiting-operators.html [ Failure ]
</del><span class="cx"> webgl/1.0.2/conformance/glsl/misc/shaders-with-varyings.html [ Failure ]
</span><span class="cx"> webgl/1.0.2/conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html [ Failure ]
</span><span class="cx"> webgl/1.0.2/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html [ Failure ]
</span><span class="lines">@@ -708,6 +705,9 @@
</span><span class="cx"> webgl/1.0.2/conformance/typedarrays/array-unit-tests.html [ Failure ]
</span><span class="cx"> webgl/1.0.2/conformance/typedarrays/data-view-test.html [ Failure ]
</span><span class="cx">
</span><ins>+# Test is faulty, skipping for now
+webgl/1.0.2/conformance/ogles/GL/build/build_009_to_016.html [ Failure ]
+
</ins><span class="cx"> # Skipping all webgl conformance tests on trunk
</span><span class="cx"> webgl/conformance
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-05 Roger Fong <roger_fong@apple.com>
+
+ [WebGL] Make sure we satisfy uniform and varying packing restrictions.
+ https://bugs.webkit.org/show_bug.cgi?id=125124.
+ <rdar://problem/15203291>
+
+ Reviewed by Brent Fulgham.
+
+ * src/compiler/Compiler.cpp:
+ Add a check to enforcePackingRestrictions to ensure we make sure packing restrictions for varyings are satisfied as well.
+ (TCompiler::TCompiler):
+ (TCompiler::Init):
+ (TCompiler::compile):
+ (TCompiler::enforcePackingRestrictions):
+ * src/compiler/ShHandle.h: Keep track of maximum varying vectors.
+
</ins><span class="cx"> 2013-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix ANGLE build failures by re-comitting the changes in http://trac.webkit.org/changeset/154223
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilerCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/Compiler.cpp 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> : shaderType(type),
</span><span class="cx"> shaderSpec(spec),
</span><span class="cx"> maxUniformVectors(0),
</span><ins>+ maxVaryingVectors(0),
</ins><span class="cx"> maxExpressionComplexity(0),
</span><span class="cx"> maxCallStackDepth(0),
</span><span class="cx"> fragmentPrecisionHigh(false),
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx"> maxUniformVectors = (shaderType == SH_VERTEX_SHADER) ?
</span><span class="cx"> resources.MaxVertexUniformVectors :
</span><span class="cx"> resources.MaxFragmentUniformVectors;
</span><ins>+ maxVaryingVectors = resources.MaxVaryingVectors;
</ins><span class="cx"> maxExpressionComplexity = resources.MaxExpressionComplexity;
</span><span class="cx"> maxCallStackDepth = resources.MaxCallStackDepth;
</span><span class="cx">
</span><span class="lines">@@ -203,13 +205,8 @@
</span><span class="cx">
</span><span class="cx"> if (success && (compileOptions & SH_VARIABLES)) {
</span><span class="cx"> collectVariables(root);
</span><del>- if (compileOptions & SH_ENFORCE_PACKING_RESTRICTIONS) {
</del><ins>+ if (compileOptions & SH_ENFORCE_PACKING_RESTRICTIONS)
</ins><span class="cx"> success = enforcePackingRestrictions();
</span><del>- if (!success) {
- infoSink.info.prefix(EPrefixError);
- infoSink.info << "too many uniforms";
- }
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (success && (compileOptions & SH_INTERMEDIATE_TREE))
</span><span class="lines">@@ -399,7 +396,22 @@
</span><span class="cx"> bool TCompiler::enforcePackingRestrictions()
</span><span class="cx"> {
</span><span class="cx"> VariablePacker packer;
</span><del>- return packer.CheckVariablesWithinPackingLimits(maxUniformVectors, uniforms);
</del><ins>+ bool success = packer.CheckVariablesWithinPackingLimits(maxUniformVectors, uniforms);
+ if (!success) {
+ infoSink.info.prefix(EPrefixError);
+ infoSink.info << "too many uniforms";
+ return false;
+ }
+
+ success = packer.CheckVariablesWithinPackingLimits(maxVaryingVectors, varyings);
+
+ if (!success) {
+ infoSink.info.prefix(EPrefixError);
+ infoSink.info << "too many varyings";
+ return false;
+ }
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TCompiler::mapLongVariableNames(TIntermNode* root)
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEsrccompilerShHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/src/compiler/ShHandle.h (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/src/compiler/ShHandle.h 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/Source/ThirdParty/ANGLE/src/compiler/ShHandle.h 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> // Translate to object code.
</span><span class="cx"> virtual void translate(TIntermNode* root) = 0;
</span><span class="cx"> // Returns true if, after applying the packing rules in the GLSL 1.017 spec
</span><del>- // Appendix A, section 7, the shader does not use too many uniforms.
</del><ins>+ // Appendix A, section 7, the shader does not use too many uniforms or varyings.
</ins><span class="cx"> bool enforcePackingRestrictions();
</span><span class="cx"> // Returns true if the shader passes the restrictions that aim to prevent timing attacks.
</span><span class="cx"> bool enforceTimingRestrictions(TIntermNode* root, bool outputGraph);
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> ShShaderSpec shaderSpec;
</span><span class="cx">
</span><span class="cx"> int maxUniformVectors;
</span><ins>+ int maxVaryingVectors;
</ins><span class="cx"> int maxExpressionComplexity;
</span><span class="cx"> int maxCallStackDepth;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/Source/WebCore/ChangeLog 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-05 Roger Fong <roger_fong@apple.com>
+
+ [WebGL] Make sure we satisfy uniform and varying packing restrictions.
+ https://bugs.webkit.org/show_bug.cgi?id=125124.
+ <rdar://problem/15203291>
+
+ Reviewed by Brent Fulgham.
+
+ Tests covered by WebGL Khronos conformance tests:
+ webgl/1.0.2/conformance/glsl/misc/shader-uniform-packing-restrictions.html
+ webgl/1.0.2/conformance/glsl/misc/shader-varying-packing-restrictions.html
+
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
+
</ins><span class="cx"> 2013-12-05 Laszlo Vidacs <lac@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> 32bit buildfix after r160151
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglExtensions3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (160198 => 160199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2013-12-05 23:37:08 UTC (rev 160198)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2013-12-05 23:45:28 UTC (rev 160199)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> String translatedShaderSource;
</span><span class="cx"> String shaderInfoLog;
</span><del>- int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS | SH_UNFOLD_SHORT_CIRCUIT;
</del><ins>+ int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS | SH_UNFOLD_SHORT_CIRCUIT | SH_ENFORCE_PACKING_RESTRICTIONS;
</ins><span class="cx">
</span><span class="cx"> if (m_requiresBuiltInFunctionEmulation)
</span><span class="cx"> extraCompileOptions |= SH_EMULATE_BUILT_IN_FUNCTIONS;
</span></span></pre>
</div>
</div>
</body>
</html>