commit c72c6416819435fd34ddc265b2df66f0a4289aa1
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Sep 20 16:09:17 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Sep 20 16:09:17 2011 +0000
tree c54236d1f08bd570a2e8572df40a0a681dcff37b
parent 024f1a91391fe789155d344b8f2d46de2bf14e42

Decorate arrays uniforms with "ar_" to identify arrays of size 1.

TRAC #16567
Bug=136
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@760 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Program.cpp

diff --git a/src/libGLESv2/Program.cpp b/src/libGLESv2/Program.cpp
index 476999f..206d62e 100644
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -34,7 +34,7 @@
 }
 
 Uniform::Uniform(GLenum type, const std::string &_name, unsigned int arraySize)
-    : type(type), _name(_name), name(Program::undecorate(_name)), arraySize(arraySize)
+    : type(type), _name(_name), name(Program::undecorateUniform(_name)), arraySize(arraySize)
 {
     int bytes = UniformTypeSize(type) * arraySize;
     data = new unsigned char[bytes];
@@ -50,11 +50,11 @@
 
 bool Uniform::isArray()
 {
-    return arraySize != 1;   // FIXME: Arrays can be of size 1
+    return _name.substr(0, 3) == "ar_";
 }
 
 UniformLocation::UniformLocation(const std::string &_name, unsigned int element, unsigned int index) 
-    : name(Program::undecorate(_name)), element(element), index(index)
+    : name(Program::undecorateUniform(_name)), element(element), index(index)
 {
 }
 
@@ -1282,7 +1282,7 @@
           default:  UNREACHABLE();
         }
 
-        mVertexHLSL += decorate(attribute->name) + " : TEXCOORD" + str(semanticIndex) + ";\n";
+        mVertexHLSL += decorateAttribute(attribute->name) + " : TEXCOORD" + str(semanticIndex) + ";\n";
 
         semanticIndex += VariableRowCount(attribute->type);
     }
@@ -1317,14 +1317,14 @@
 
     for (AttributeArray::iterator attribute = mVertexShader->mAttributes.begin(); attribute != mVertexShader->mAttributes.end(); attribute++)
     {
-        mVertexHLSL += "    " + decorate(attribute->name) + " = ";
+        mVertexHLSL += "    " + decorateAttribute(attribute->name) + " = ";
 
         if (VariableRowCount(attribute->type) > 1)   // Matrix
         {
             mVertexHLSL += "transpose";
         }
 
-        mVertexHLSL += "(input." + decorate(attribute->name) + ");\n";
+        mVertexHLSL += "(input." + decorateAttribute(attribute->name) + ");\n";
     }
 
     mVertexHLSL += "\n"
@@ -1903,7 +1903,7 @@
 }
 
 // This method needs to match OutputHLSL::decorate
-std::string Program::decorate(const std::string &name)
+std::string Program::decorateAttribute(const std::string &name)
 {
     if (name.substr(0, 3) != "gl_" && name.substr(0, 3) != "dx_")
     {
@@ -1913,12 +1913,16 @@
     return name;
 }
 
-std::string Program::undecorate(const std::string &_name)
+std::string Program::undecorateUniform(const std::string &_name)
 {
     if (_name.substr(0, 1) == "_")
     {
         return _name.substr(1);
     }
+    else if (_name.substr(0, 3) == "ar_")
+    {
+        return _name.substr(3);
+    }
     
     return _name;
 }