<!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>[161862] 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/161862">161862</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-12 22:29:18 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/161843">r161843</a>.
http://trac.webkit.org/changeset/161843
https://bugs.webkit.org/show_bug.cgi?id=126871
Caused CSS custom filter tests to assert (Requested by smfr on
#webkit).
Source/WebCore:
* platform/graphics/ANGLEWebKitBridge.cpp:
(WebCore::getSymbolInfo):
(WebCore::ANGLEWebKitBridge::compileShaderSource):
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::compileShader):
(WebCore::GraphicsContext3D::getProgramInfoLog):
(WebCore::GraphicsContext3D::getShaderInfoLog):
LayoutTests:
* fast/canvas/webgl/glsl-conformance-expected.txt:
* fast/canvas/webgl/glsl-conformance.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglglslconformanceexpectedtxt">trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvaswebglglslconformancehtml">trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgecpp">trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/LayoutTests/ChangeLog 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-12 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r161843.
+ http://trac.webkit.org/changeset/161843
+ https://bugs.webkit.org/show_bug.cgi?id=126871
+
+ Caused CSS custom filter tests to assert (Requested by smfr on
+ #webkit).
+
+ * fast/canvas/webgl/glsl-conformance-expected.txt:
+ * fast/canvas/webgl/glsl-conformance.html:
+
</ins><span class="cx"> 2014-01-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test maintenance.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglglslconformanceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -28,9 +28,6 @@
</span><span class="cx"> PASS [vshaderWithVersion130/fshader]: vertex shader uses the #version not 100 directive should fail
</span><span class="cx"> PASS [vshaderWithVersion120/fshader]: vertex shader uses the #version not 100 directive should fail
</span><span class="cx"> PASS [vshaderWithVersion100/fshader]: vertex shader uses the #version 100 directive should succeed
</span><del>-Program link log:ERROR: Input of fragment shader 'v_varying' not written by vertex shader
-
-PASS [vshaderWithVersion100/fragmentShaderUsedVarying]: vertex shader with no varying and fragment shader with used varying must fail
</del><span class="cx"> PASS [shaders/implicit/add_int_float.vert/fshader]: implicit cast adding integer to float should fail
</span><span class="cx"> PASS [shaders/implicit/add_int_mat2.vert/fshader]: implicit cast adding integer to mat2 should fail
</span><span class="cx"> PASS [shaders/implicit/add_int_mat3.vert/fshader]: implicit cast adding integer to mat3 should fail
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvaswebglglslconformancehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -211,16 +211,6 @@
</span><span class="cx"> gl_Position = vPosition;
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<script id="fragmentShaderUsedVarying" type="text/something-not-javascript">
-precision mediump float;
-
-varying vec4 v_varying;
-
-void main()
-{
- gl_FragColor = v_varying;
-}
-</script>
</del><span class="cx"> <script id="vshaderWith__FILE__" type="text/something-not-javascript">
</span><span class="cx"> __FILE__
</span><span class="cx"> </script>
</span><span class="lines">@@ -413,13 +403,6 @@
</span><span class="cx"> linkSuccess: true,
</span><span class="cx"> passMsg: 'vertex shader uses the #version 100 directive should succeed',
</span><span class="cx"> },
</span><del>- { vShaderId: 'vshaderWithVersion100',
- vShaderSuccess: true,
- fShaderId: 'fragmentShaderUsedVarying',
- fShaderSuccess: true,
- linkSuccess: false,
- passMsg: 'vertex shader with no varying and fragment shader with used varying must fail',
- },
</del><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> // Read in all the shader source.
</span><span class="lines">@@ -515,17 +498,13 @@
</span><span class="cx"> gl.linkProgram(program);
</span><span class="cx"> var linked = (gl.getProgramParameter(program, gl.LINK_STATUS) != 0);
</span><span class="cx"> if (!linked) {
</span><del>- var error = gl.getProgramInfoLog(program);
</del><ins>+ var error = gl.getProgramInfoLog(shader);
</ins><span class="cx"> log("*** Error linking program '"+program+"':"+error);
</span><span class="cx"> }
</span><span class="cx"> if (linked != info.linkSuccess) {
</span><span class="cx"> testFailed(passMsg);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- if (!info.linkSuccess) {
- var error = gl.getProgramInfoLog(program);
- debug("Program link log:" + error);
- }
</del><span class="cx"> } else {
</span><span class="cx"> if (info.linkSuccess) {
</span><span class="cx"> testFailed(passMsg);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/Source/WebCore/ChangeLog 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-01-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r161843.
+ http://trac.webkit.org/changeset/161843
+ https://bugs.webkit.org/show_bug.cgi?id=126871
+
+ Caused CSS custom filter tests to assert (Requested by smfr on
+ #webkit).
+
+ * platform/graphics/ANGLEWebKitBridge.cpp:
+ (WebCore::getSymbolInfo):
+ (WebCore::ANGLEWebKitBridge::compileShaderSource):
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::compileShader):
+ (WebCore::GraphicsContext3D::getProgramInfoLog):
+ (WebCore::GraphicsContext3D::getShaderInfoLog):
+
+2014-01-12 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r161840.
</span><span class="cx"> http://trac.webkit.org/changeset/161840
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126870
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> break;
</span><span class="cx"> case SH_VARYINGS:
</span><span class="cx"> symbolMaxNameLengthType = SH_VARYING_MAX_LENGTH;
</span><del>- break;
</del><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="lines">@@ -228,8 +227,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!getSymbolInfo(compiler, SH_ACTIVE_UNIFORMS, symbols))
</span><span class="cx"> return false;
</span><del>- if (!getSymbolInfo(compiler, SH_VARYINGS, symbols))
- return false;
</del><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -739,7 +739,6 @@
</span><span class="cx"> void getProgramiv(Platform3DObject program, GC3Denum pname, GC3Dint* value);
</span><span class="cx"> void getNonBuiltInActiveSymbolCount(Platform3DObject program, GC3Denum pname, GC3Dint* value);
</span><span class="cx"> String getProgramInfoLog(Platform3DObject);
</span><del>- String getUnmangledInfoLog(Platform3DObject[2], GC3Dsizei, const String&);
</del><span class="cx"> void getRenderbufferParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value);
</span><span class="cx"> void getShaderiv(Platform3DObject, GC3Denum pname, GC3Dint* value);
</span><span class="cx"> String getShaderInfoLog(Platform3DObject);
</span><span class="lines">@@ -1085,7 +1084,6 @@
</span><span class="cx"> std::unique_ptr<ActiveShaderSymbolCounts> m_shaderSymbolCount;
</span><span class="cx">
</span><span class="cx"> String mappedSymbolName(Platform3DObject program, ANGLEShaderSymbolType, const String& name);
</span><del>- String mappedSymbolName(Platform3DObject shaders[2], size_t count, const String& name);
</del><span class="cx"> String originalSymbolName(Platform3DObject program, ANGLEShaderSymbolType, const String& name);
</span><span class="cx">
</span><span class="cx"> ANGLEWebKitBridge m_compiler;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (161861 => 161862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-01-13 06:26:50 UTC (rev 161861)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-01-13 06:29:18 UTC (rev 161862)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><del>-#include "RegularExpression.h"
</del><span class="cx"> #include "TemporaryOpenGLSetting.h"
</span><span class="cx"> #include <cstring>
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="lines">@@ -547,8 +546,7 @@
</span><span class="cx"> auto info = std::make_unique<GLchar[]>(length);
</span><span class="cx"> ::glGetShaderInfoLog(shader, length, &size, info.get());
</span><span class="cx">
</span><del>- Platform3DObject shaders[2] = { shader, 0 };
- entry.log = getUnmangledInfoLog(shaders, 1, String(info.get()));
</del><ins>+ entry.log = info.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (GLCompileSuccess != GL_TRUE) {
</span><span class="lines">@@ -808,24 +806,6 @@
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String GraphicsContext3D::mappedSymbolName(Platform3DObject shaders[2], size_t count, const String& name)
-{
- for (size_t symbolType = 0; symbolType <= static_cast<size_t>(SHADER_SYMBOL_TYPE_VARYING); ++symbolType) {
- for (size_t i = 0; i < count; ++i) {
- ShaderSourceMap::iterator result = m_shaderSourceMap.find(shaders[i]);
- if (result == m_shaderSourceMap.end())
- continue;
-
- const ShaderSymbolMap& symbolMap = result->value.symbolMap(static_cast<enum ANGLEShaderSymbolType>(symbolType));
- for (const auto& symbolEntry : symbolMap) {
- if (symbolEntry.value.mappedName == name)
- return symbolEntry.key;
- }
- }
- }
- return name;
-}
-
</del><span class="cx"> int GraphicsContext3D::getAttribLocation(Platform3DObject program, const String& name)
</span><span class="cx"> {
</span><span class="cx"> if (!program)
</span><span class="lines">@@ -1298,36 +1278,6 @@
</span><span class="cx"> *value = m_shaderSymbolCount->countForType(pname);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String GraphicsContext3D::getUnmangledInfoLog(Platform3DObject shaders[2], GC3Dsizei count, const String& log)
-{
- LOG(WebGL, "Was: %s", log.utf8().data());
-
- RegularExpression regExp("webgl_[0123456789abcdefABCDEF]+", TextCaseSensitive);
-
- String processedLog;
-
- int startFrom = 0;
- int matchedLength = 0;
- do {
- int start = regExp.match(log, startFrom, &matchedLength);
- if (start == -1)
- break;
-
- processedLog.append(log.substring(startFrom, start - startFrom));
- startFrom = start + matchedLength;
-
- const String& mangledSymbol = log.substring(start, matchedLength);
- const String& mappedSymbol = mappedSymbolName(shaders, count, mangledSymbol);
- LOG(WebGL, "Demangling: %s to %s", mangledSymbol.utf8().data(), mappedSymbol.utf8().data());
- processedLog.append(mappedSymbol);
- } while (startFrom < static_cast<int>(log.length()));
-
- processedLog.append(log.substring(startFrom, log.length() - startFrom));
-
- LOG(WebGL, "-->: %s", processedLog.utf8().data());
- return processedLog;
-}
-
</del><span class="cx"> String GraphicsContext3D::getProgramInfoLog(Platform3DObject program)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(program);
</span><span class="lines">@@ -1342,11 +1292,7 @@
</span><span class="cx"> auto info = std::make_unique<GLchar[]>(length);
</span><span class="cx"> ::glGetProgramInfoLog(program, length, &size, info.get());
</span><span class="cx">
</span><del>- GC3Dsizei count;
- Platform3DObject shaders[2];
- getAttachedShaders(program, 2, &count, shaders);
-
- return getUnmangledInfoLog(shaders, count, String(info.get()));
</del><ins>+ return String(info.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::getRenderbufferParameteriv(GC3Denum target, GC3Denum pname, GC3Dint* value)
</span><span class="lines">@@ -1413,8 +1359,7 @@
</span><span class="cx"> auto info = std::make_unique<GLchar[]>(length);
</span><span class="cx"> ::glGetShaderInfoLog(shader, length, &size, info.get());
</span><span class="cx">
</span><del>- Platform3DObject shaders[2] = { shader, 0 };
- return getUnmangledInfoLog(shaders, 1, String(info.get()));
</del><ins>+ return String(info.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String GraphicsContext3D::getShaderSource(Platform3DObject shader)
</span></span></pre>
</div>
</div>
</body>
</html>