Eliminated storing decorated uniform names.

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 1
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1563
+#define BUILD_REVISION 1564
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/OutputHLSL.cpp

@@ -2579,11 +2579,7 @@ TString OutputHLSL::decorate(const TString &string)
 
 TString OutputHLSL::decorateUniform(const TString &string, const TType &type)
 {
-    if (type.isArray())
-    {
-        return "ar_" + string;   // Allows identifying arrays of size 1
-    }
-    else if (type.getBasicType() == EbtSamplerExternalOES)
+    if (type.getBasicType() == EbtSamplerExternalOES)
     {
         return "ex_" + string;
     }

src/libGLESv2/ProgramBinary.cpp

@@ -30,8 +30,8 @@ std::string str(int i)
     return buffer;
 }
 
-UniformLocation::UniformLocation(const std::string &_name, unsigned int element, unsigned int index) 
-    : name(Uniform::undecorate(_name)), element(element), index(index)
+UniformLocation::UniformLocation(const std::string &name, unsigned int element, unsigned int index) 
+    : name(name), element(element), index(index)
 {
 }
 
@@ -1577,14 +1577,14 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
     for (unsigned int i = 0; i < size; ++i)
     {
         GLenum type;
-        std::string _name;
+        std::string name;
         unsigned int arraySize;
 
         stream.read(&type);
-        stream.read(&_name);
+        stream.read(&name);
         stream.read(&arraySize);
 
-        mUniforms[i] = new Uniform(type, _name, arraySize);
+        mUniforms[i] = new Uniform(type, name, arraySize);
         
         stream.read(&mUniforms[i]->ps.registerIndex);
         stream.read(&mUniforms[i]->ps.registerCount);
@@ -1694,7 +1694,7 @@ bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length)
     for (unsigned int i = 0; i < mUniforms.size(); ++i)
     {
         stream.write(mUniforms[i]->type);
-        stream.write(mUniforms[i]->_name);
+        stream.write(mUniforms[i]->name);
         stream.write(mUniforms[i]->arraySize);
 
         stream.write(mUniforms[i]->ps.registerIndex);

src/libGLESv2/ProgramBinary.h

@@ -37,7 +37,7 @@ struct UniformLocation
     {
     }
 
-    UniformLocation(const std::string &_name, unsigned int element, unsigned int index);
+    UniformLocation(const std::string &name, unsigned int element, unsigned int index);
 
     std::string name;
     unsigned int element;

src/libGLESv2/Uniform.cpp

@@ -11,8 +11,8 @@
 namespace gl
 {
 
-Uniform::Uniform(GLenum type, const std::string &_name, unsigned int arraySize)
-    : type(type), _name(_name), name(undecorate(_name)), arraySize(arraySize)
+Uniform::Uniform(GLenum type, const std::string &name, unsigned int arraySize)
+    : type(type), name(name), arraySize(arraySize)
 {
     int bytes = gl::UniformInternalSize(type) * elementCount();
     data = new unsigned char[bytes];
@@ -27,17 +27,7 @@ Uniform::~Uniform()
 
 bool Uniform::isArray() const
 {
-    if (name != _name)   // D3D9_REPLACE
-    {
-        size_t dot = _name.find_last_of('.');
-        if (dot == std::string::npos) dot = -1;
-
-        return _name.compare(dot + 1, dot + 4, "ar_") == 0;
-    }
-    else
-    {
-        return arraySize > 0;
-    }
+    return arraySize > 0;
 }
 
 unsigned int Uniform::elementCount() const
@@ -50,28 +40,4 @@ unsigned int Uniform::registerCount() const
     return VariableRowCount(type) * elementCount();
 }
 
-std::string Uniform::undecorate(const std::string &_name)
-{
-    std::string name = _name;
-    
-    // Remove any structure field decoration
-    size_t pos = 0;
-    while ((pos = name.find("._", pos)) != std::string::npos)
-    {
-        name.replace(pos, 2, ".");
-    }
-
-    // Remove the leading decoration
-    if (name[0] == '_')
-    {
-        return name.substr(1);
-    }
-    else if (name.compare(0, 3, "ar_") == 0)
-    {
-        return name.substr(3);
-    }
-    
-    return name;
-}
-
 }

src/libGLESv2/Uniform.h

@@ -21,18 +21,16 @@ namespace gl
 // Helper struct representing a single shader uniform
 struct Uniform
 {
-    Uniform(GLenum type, const std::string &_name, unsigned int arraySize);
+    Uniform(GLenum type, const std::string &name, unsigned int arraySize);
 
     ~Uniform();
 
     bool isArray() const;
     unsigned int elementCount() const;
     unsigned int registerCount() const;
-    static std::string Uniform::undecorate(const std::string &_name);
 
     const GLenum type;
-    const std::string _name;   // Decorated name
-    const std::string name;    // Undecorated name
+    const std::string name;
     const unsigned int arraySize;
 
     unsigned char *data;