commit 63491eae7cce075afbbea3caed173bd234fa4cd9
author Jamie Madill <jmadill@transgaming.com> Thu Jun 06 11:56:45 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:04:53 2013 -0400
tree e5160c5c16b3ac7e7198ae4b860776ef425fd1d2
parent 6c23946c8bf9cf79079340530102c04be21dff7f

Rename UniformLocation to VariableLocation, and add an arrayString helper method to ProgramBinary.

TRAC #23268

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Authored-by: Jamie Madill

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index a23fb54..7ce0783 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -36,6 +36,11 @@
     return buffer;
 }
 
+std::string arrayString(int i)
+{
+    return "[" + str(i) + "]";
+}
+
 namespace gl_d3d
 {
     std::string TypeString(GLenum type)
@@ -89,7 +94,7 @@
 
 }
 
-UniformLocation::UniformLocation(const std::string &name, unsigned int element, unsigned int index) 
+VariableLocation::VariableLocation(const std::string &name, unsigned int element, unsigned int index) 
     : name(name), element(element), index(index)
 {
 }
@@ -1293,12 +1298,12 @@
                     
                     if (varying->array)
                     {
-                        vertexHLSL += "[" + str(i) + "]";
+                        vertexHLSL += arrayString(i);
                     }
 
                     if (rows > 1)
                     {
-                        vertexHLSL += "[" + str(j) + "]";
+                        vertexHLSL += arrayString(j);
                     }
                     
                     vertexHLSL += ";\n";
@@ -1435,12 +1440,12 @@
 
                     if (varying->array)
                     {
-                        pixelHLSL += "[" + str(i) + "]";
+                        pixelHLSL += arrayString(i);
                     }
 
                     if (rows > 1)
                     {
-                        pixelHLSL += "[" + str(j) + "]";
+                        pixelHLSL += arrayString(j);
                     }
 
                     switch (VariableColumnCount(transposedType))
@@ -2165,7 +2170,7 @@
                 for (size_t fieldIndex = 0; fieldIndex < constant.fields.size(); fieldIndex++)
                 {
                     const sh::Uniform &field = constant.fields[fieldIndex];
-                    const std::string &uniformName = constant.name + "[" + str(elementIndex) + "]." + field.name;
+                    const std::string &uniformName = constant.name + arrayString(elementIndex) + "." + field.name;
                     const sh::Uniform fieldUniform(field.type, field.precision, uniformName.c_str(), field.arraySize, elementRegisterIndex);
                     if (!defineUniform(shader, fieldUniform, infoLog))
                     {
@@ -2279,7 +2284,7 @@
 
     for (unsigned int arrayElementIndex = 0; arrayElementIndex < uniform->elementCount(); arrayElementIndex++)
     {
-        mUniformIndex.push_back(UniformLocation(uniform->name, arrayElementIndex, uniformIndex));
+        mUniformIndex.push_back(VariableLocation(uniform->name, arrayElementIndex, uniformIndex));
     }
 
     if (shader == GL_VERTEX_SHADER)
@@ -2400,7 +2405,7 @@
             {
                 for (unsigned int arrayElement = 0; arrayElement < uniform.arraySize; arrayElement++)
                 {
-                    const std::string uniformElementName = uniform.name + "[" + str(arrayElement) + "]";
+                    const std::string uniformElementName = uniform.name + arrayString(arrayElement);
                     defineUniformBlockMembers(uniform.fields, uniformElementName, blockIndex, blockInfoItr, blockUniformIndexes);
                 }
             }
@@ -2803,7 +2808,7 @@
 
         if (uniformBlock.isArrayElement())
         {
-            string += "[" + str(uniformBlock.elementIndex) + "]";
+            string += arrayString(uniformBlock.elementIndex);
         }
 
         strncpy(uniformBlockName, string.c_str(), bufSize);