<!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>[166803] 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/166803">166803</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 15:08:47 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Keep track of filtered active attribute/uniform indices per shader program.
https://bugs.webkit.org/show_bug.cgi?id=131235.
Reviewed by Dean Jackson.
Tests: Covered by existing Khronos Conformance tests.
Will create a test to use multiple shader programs in a follow-up patch.
* html/canvas/WebGLProgram.cpp:
(WebCore::WebGLProgram::cacheActiveAttribLocations): Use getActiveAttribImpl. We do not need to use the filtered list of attributes here.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::getUniformLocation): Use filtered list of uniforms for uniform count.
* platform/graphics/GraphicsContext3D.h: Create a map of shader programs to ActiveShaderSymbolCounts.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::attachShader):
When attaching or detaching a shader the shader program's active symbols list will change. Clear it so that it will be updated later.
(WebCore::GraphicsContext3D::detachShader): Ditto.
(WebCore::GraphicsContext3D::compileShader): No need to clear symbol counts here.
(WebCore::GraphicsContext3D::getActiveAttrib): getActiveAttrib should only be able to query for attributes in the filtered list.
(WebCore::GraphicsContext3D::getActiveUniform): getActiveUniform should only be able to query for uniforms in the filtered list.
(WebCore::GraphicsContext3D::getNonBuiltInActiveSymbolCount): Return the filtered symbol count for a shader program.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLProgramcpp">trunk/Source/WebCore/html/canvas/WebGLProgram.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166802 => 166803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-04 22:06:20 UTC (rev 166802)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 22:08:47 UTC (rev 166803)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-04-04 Roger Fong <roger_fong@apple.com>
+
+ Keep track of filtered active attribute/uniform indices per shader program.
+ https://bugs.webkit.org/show_bug.cgi?id=131235.
+
+ Reviewed by Dean Jackson.
+
+ Tests: Covered by existing Khronos Conformance tests.
+ Will create a test to use multiple shader programs in a follow-up patch.
+
+ * html/canvas/WebGLProgram.cpp:
+ (WebCore::WebGLProgram::cacheActiveAttribLocations): Use getActiveAttribImpl. We do not need to use the filtered list of attributes here.
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getUniformLocation): Use filtered list of uniforms for uniform count.
+ * platform/graphics/GraphicsContext3D.h: Create a map of shader programs to ActiveShaderSymbolCounts.
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::attachShader):
+ When attaching or detaching a shader the shader program's active symbols list will change. Clear it so that it will be updated later.
+ (WebCore::GraphicsContext3D::detachShader): Ditto.
+ (WebCore::GraphicsContext3D::compileShader): No need to clear symbol counts here.
+ (WebCore::GraphicsContext3D::getActiveAttrib): getActiveAttrib should only be able to query for attributes in the filtered list.
+ (WebCore::GraphicsContext3D::getActiveUniform): getActiveUniform should only be able to query for uniforms in the filtered list.
+ (WebCore::GraphicsContext3D::getNonBuiltInActiveSymbolCount): Return the filtered symbol count for a shader program.
+
</ins><span class="cx"> 2014-04-04 Ion Rosca <rosca@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Blending] Add compositing reason for isolation.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLProgramcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLProgram.cpp (166802 => 166803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLProgram.cpp 2014-04-04 22:06:20 UTC (rev 166802)
+++ trunk/Source/WebCore/html/canvas/WebGLProgram.cpp 2014-04-04 22:08:47 UTC (rev 166803)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> m_activeAttribLocations.resize(static_cast<size_t>(numAttribs));
</span><span class="cx"> for (int i = 0; i < numAttribs; ++i) {
</span><span class="cx"> ActiveInfo info;
</span><del>- context3d->getActiveAttrib(object(), i, info);
</del><ins>+ context3d->getActiveAttribImpl(object(), i, info);
</ins><span class="cx"> m_activeAttribLocations[i] = context3d->getAttribLocation(object(), info.name);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (166802 => 166803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-04-04 22:06:20 UTC (rev 166802)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-04-04 22:08:47 UTC (rev 166803)
</span><span class="lines">@@ -3212,7 +3212,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> GC3Dint activeUniforms = 0;
</span><del>- m_context->getProgramiv(objectOrZero(program), GraphicsContext3D::ACTIVE_UNIFORMS, &activeUniforms);
</del><ins>+ m_context->getNonBuiltInActiveSymbolCount(objectOrZero(program), GraphicsContext3D::ACTIVE_UNIFORMS, &activeUniforms);
</ins><span class="cx"> for (GC3Dint i = 0; i < activeUniforms; i++) {
</span><span class="cx"> ActiveInfo info;
</span><span class="cx"> if (!m_context->getActiveUniform(objectOrZero(program), i, info))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (166802 => 166803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-04-04 22:06:20 UTC (rev 166802)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-04-04 22:08:47 UTC (rev 166803)
</span><span class="lines">@@ -1085,8 +1085,9 @@
</span><span class="cx"> return filteredToActualUniformIndexMap.size();
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- std::unique_ptr<ActiveShaderSymbolCounts> m_shaderSymbolCount;
-
</del><ins>+ typedef HashMap<Platform3DObject, ActiveShaderSymbolCounts> ShaderProgramSymbolCountMap;
+ ShaderProgramSymbolCountMap m_shaderProgramSymbolCountMap;
+
</ins><span class="cx"> String mappedSymbolName(Platform3DObject program, ANGLEShaderSymbolType, const String& name);
</span><span class="cx"> String mappedSymbolName(Platform3DObject shaders[2], size_t count, const String& name);
</span><span class="cx"> String originalSymbolName(Platform3DObject program, ANGLEShaderSymbolType, const String& name);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (166802 => 166803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-04-04 22:06:20 UTC (rev 166802)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2014-04-04 22:08:47 UTC (rev 166803)
</span><span class="lines">@@ -374,6 +374,7 @@
</span><span class="cx"> ASSERT(program);
</span><span class="cx"> ASSERT(shader);
</span><span class="cx"> makeContextCurrent();
</span><ins>+ m_shaderProgramSymbolCountMap.remove(program);
</ins><span class="cx"> ::glAttachShader(program, shader);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -561,8 +562,6 @@
</span><span class="cx"> entry.isValid = false;
</span><span class="cx"> LOG(WebGL, "Error: shader translator produced a shader that OpenGL would not compile.");
</span><span class="cx"> }
</span><del>-
- m_shaderSymbolCount = nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::copyTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Dint border)
</span><span class="lines">@@ -612,6 +611,7 @@
</span><span class="cx"> ASSERT(program);
</span><span class="cx"> ASSERT(shader);
</span><span class="cx"> makeContextCurrent();
</span><ins>+ m_shaderProgramSymbolCountMap.remove(program);
</ins><span class="cx"> ::glDetachShader(program, shader);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -719,8 +719,15 @@
</span><span class="cx">
</span><span class="cx"> bool GraphicsContext3D::getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo& info)
</span><span class="cx"> {
</span><del>- ASSERT(!m_shaderSymbolCount || index < m_shaderSymbolCount->filteredToActualAttributeIndexMap.size());
- GC3Duint rawIndex = (m_shaderSymbolCount) ? m_shaderSymbolCount->filteredToActualAttributeIndexMap[index] : index;
</del><ins>+ GC3Dint symbolCount;
+ auto result = m_shaderProgramSymbolCountMap.find(program);
+ if (result == m_shaderProgramSymbolCountMap.end()) {
+ getNonBuiltInActiveSymbolCount(program, GraphicsContext3D::ACTIVE_ATTRIBUTES, &symbolCount);
+ result = m_shaderProgramSymbolCountMap.find(program);
+ }
+
+ ActiveShaderSymbolCounts& symbolCounts = result->value;
+ GC3Duint rawIndex = (index < symbolCounts.filteredToActualAttributeIndexMap.size()) ? symbolCounts.filteredToActualAttributeIndexMap[index] : -1;
</ins><span class="cx">
</span><span class="cx"> return getActiveAttribImpl(program, rawIndex, info);
</span><span class="cx"> }
</span><span class="lines">@@ -759,9 +766,16 @@
</span><span class="cx">
</span><span class="cx"> bool GraphicsContext3D::getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo& info)
</span><span class="cx"> {
</span><del>- ASSERT(!m_shaderSymbolCount || index < m_shaderSymbolCount->filteredToActualUniformIndexMap.size());
- GC3Duint rawIndex = (m_shaderSymbolCount) ? m_shaderSymbolCount->filteredToActualUniformIndexMap[index] : index;
</del><ins>+ GC3Dint symbolCount;
+ auto result = m_shaderProgramSymbolCountMap.find(program);
+ if (result == m_shaderProgramSymbolCountMap.end()) {
+ getNonBuiltInActiveSymbolCount(program, GraphicsContext3D::ACTIVE_UNIFORMS, &symbolCount);
+ result = m_shaderProgramSymbolCountMap.find(program);
+ }
</ins><span class="cx">
</span><ins>+ ActiveShaderSymbolCounts& symbolCounts = result->value;
+ GC3Duint rawIndex = (index < symbolCounts.filteredToActualUniformIndexMap.size()) ? symbolCounts.filteredToActualUniformIndexMap[index] : -1;
+
</ins><span class="cx"> return getActiveUniformImpl(program, rawIndex, info);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1268,13 +1282,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> makeContextCurrent();
</span><del>-
- if (m_shaderSymbolCount) {
- *value = m_shaderSymbolCount->countForType(pname);
</del><ins>+ const auto& result = m_shaderProgramSymbolCountMap.find(program);
+ if (result != m_shaderProgramSymbolCountMap.end()) {
+ *value = result->value.countForType(pname);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_shaderSymbolCount = std::make_unique<ActiveShaderSymbolCounts>();
</del><ins>+ m_shaderProgramSymbolCountMap.set(program, ActiveShaderSymbolCounts());
+ ActiveShaderSymbolCounts& symbolCounts = m_shaderProgramSymbolCountMap.find(program)->value;
</ins><span class="cx">
</span><span class="cx"> // Retrieve the active attributes, build a filtered count, and a mapping of
</span><span class="cx"> // our internal attributes indexes to the real unfiltered indexes inside OpenGL.
</span><span class="lines">@@ -1286,7 +1301,7 @@
</span><span class="cx"> if (info.name.startsWith("gl_"))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- m_shaderSymbolCount->filteredToActualAttributeIndexMap.append(i);
</del><ins>+ symbolCounts.filteredToActualAttributeIndexMap.append(i);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Do the same for uniforms.
</span><span class="lines">@@ -1298,10 +1313,10 @@
</span><span class="cx"> if (info.name.startsWith("gl_"))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- m_shaderSymbolCount->filteredToActualUniformIndexMap.append(i);
</del><ins>+ symbolCounts.filteredToActualUniformIndexMap.append(i);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- *value = m_shaderSymbolCount->countForType(pname);
</del><ins>+ *value = symbolCounts.countForType(pname);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String GraphicsContext3D::getUnmangledInfoLog(Platform3DObject shaders[2], GC3Dsizei count, const String& log)
</span></span></pre>
</div>
</div>
</body>
</html>