commit cfaeaa9f67638cdf2fdee72ad4d39bbeb7104bcb
author Geoff Lang <geofflang@chromium.org> Tue Apr 14 13:41:02 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Wed Apr 15 15:40:57 2015 +0000
tree 16ea985370c90e506a6de56387b0278baf8afc75
parent 5160ec11fcc5b562ef39704f68fec480a573c172

Refactor uniform array name parsing to a utility function.

BUG=angleproject:882

Change-Id: I00fd6d3cfaa107561cee5e4c82d3c60438052963
Reviewed-on: https://chromium-review.googlesource.com/265723
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/ProgramImpl.cpp

diff --git a/src/libANGLE/renderer/ProgramImpl.cpp b/src/libANGLE/renderer/ProgramImpl.cpp
index 8fbc537..4ce3f57 100644
--- a/src/libANGLE/renderer/ProgramImpl.cpp
+++ b/src/libANGLE/renderer/ProgramImpl.cpp
@@ -13,27 +13,6 @@
 namespace rx
 {
 
-namespace
-{
-
-unsigned int ParseAndStripArrayIndex(std::string* name)
-{
-    unsigned int subscript = GL_INVALID_INDEX;
-
-    // Strip any trailing array operator and retrieve the subscript
-    size_t open = name->find_last_of('[');
-    size_t close = name->find_last_of(']');
-    if (open != std::string::npos && close == name->length() - 1)
-    {
-        subscript = atoi(name->substr(open + 1).c_str());
-        name->erase(open);
-    }
-
-    return subscript;
-}
-
-}
-
 LinkResult::LinkResult(bool linkSuccess, const gl::Error &error)
     : linkSuccess(linkSuccess),
       error(error)
@@ -71,14 +50,15 @@
     return mUniformBlocks[blockIndex];
 }
 
-GLint ProgramImpl::getUniformLocation(std::string name)
+GLint ProgramImpl::getUniformLocation(const std::string &name) const
 {
-    unsigned int subscript = ParseAndStripArrayIndex(&name);
+    size_t subscript = GL_INVALID_INDEX;
+    std::string baseName = gl::ParseUniformName(name, &subscript);
 
     unsigned int numUniforms = mUniformIndex.size();
     for (unsigned int location = 0; location < numUniforms; location++)
     {
-        if (mUniformIndex[location].name == name)
+        if (mUniformIndex[location].name == baseName)
         {
             const int index = mUniformIndex[location].index;
             const bool isArray = mUniforms[index]->isArray();
@@ -94,9 +74,10 @@
     return -1;
 }
 
-GLuint ProgramImpl::getUniformIndex(std::string name)
+GLuint ProgramImpl::getUniformIndex(const std::string &name) const
 {
-    unsigned int subscript = ParseAndStripArrayIndex(&name);
+    size_t subscript = GL_INVALID_INDEX;
+    std::string baseName = gl::ParseUniformName(name, &subscript);
 
     // The app is not allowed to specify array indices other than 0 for arrays of basic types
     if (subscript != 0 && subscript != GL_INVALID_INDEX)
@@ -107,7 +88,7 @@
     unsigned int numUniforms = mUniforms.size();
     for (unsigned int index = 0; index < numUniforms; index++)
     {
-        if (mUniforms[index]->name == name)
+        if (mUniforms[index]->name == baseName)
         {
             if (mUniforms[index]->isArray() || subscript == GL_INVALID_INDEX)
             {
@@ -119,15 +100,16 @@
     return GL_INVALID_INDEX;
 }
 
-GLuint ProgramImpl::getUniformBlockIndex(std::string name) const
+GLuint ProgramImpl::getUniformBlockIndex(const std::string &name) const
 {
-    unsigned int subscript = ParseAndStripArrayIndex(&name);
+    size_t subscript = GL_INVALID_INDEX;
+    std::string baseName = gl::ParseUniformName(name, &subscript);
 
     unsigned int numUniformBlocks = mUniformBlocks.size();
     for (unsigned int blockIndex = 0; blockIndex < numUniformBlocks; blockIndex++)
     {
         const gl::UniformBlock &uniformBlock = *mUniformBlocks[blockIndex];
-        if (uniformBlock.name == name)
+        if (uniformBlock.name == baseName)
         {
             const bool arrayElementZero = (subscript == GL_INVALID_INDEX && uniformBlock.elementIndex == 0);
             if (subscript == uniformBlock.elementIndex || arrayElementZero)