Title: [87451] trunk/Source/WebCore
- Revision
- 87451
- Author
- [email protected]
- Date
- 2011-05-26 16:58:38 -0700 (Thu, 26 May 2011)
Log Message
2011-05-26 Syed Idris Shah <[email protected]>
Reviewed by Andreas Kling.
[Qt] fast/canvas/webgl/gl-uniform-arrays.html failing for Qt on Linux
https://bugs.webkit.org/show_bug.cgi?id=60377
LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html
For an array of active uniform, we should be careful while truncating the name of the uniform.
Currently we are truncating the last three characters of an array with out checking for [0].
As a result we are truncating the the actual name of the active uniforms i.e. color to co.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::getUniform): Strip "[0]" from the name if it's an array and is part of the name.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87450 => 87451)
--- trunk/Source/WebCore/ChangeLog 2011-05-26 23:47:40 UTC (rev 87450)
+++ trunk/Source/WebCore/ChangeLog 2011-05-26 23:58:38 UTC (rev 87451)
@@ -1,3 +1,19 @@
+2011-05-26 Syed Idris Shah <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] fast/canvas/webgl/gl-uniform-arrays.html failing for Qt on Linux
+ https://bugs.webkit.org/show_bug.cgi?id=60377
+
+ LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html
+
+ For an array of active uniform, we should be careful while truncating the name of the uniform.
+ Currently we are truncating the last three characters of an array with out checking for [0].
+ As a result we are truncating the the actual name of the active uniforms i.e. color to co.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getUniform): Strip "[0]" from the name if it's an array and is part of the name.
+
2011-05-26 Sheriff Bot <[email protected]>
Unreviewed, rolling out r87444.
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (87450 => 87451)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2011-05-26 23:47:40 UTC (rev 87450)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2011-05-26 23:58:38 UTC (rev 87451)
@@ -2444,7 +2444,7 @@
if (!m_context->getActiveUniform(objectOrZero(program), i, info))
return WebGLGetInfo();
// Strip "[0]" from the name if it's an array.
- if (info.size > 1)
+ if (info.size > 1 && info.name.endsWith("[0]"))
info.name = info.name.left(info.name.length() - 3);
// If it's an array, we need to iterate through each element, appending "[index]" to the name.
for (GC3Dint index = 0; index < info.size; ++index) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
