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
diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index bf6f00f..b5c4eb6 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -43,13 +43,13 @@
class Buffer;
// Struct used for correlating uniforms/elements of uniform arrays to handles
-struct UniformLocation
+struct VariableLocation
{
- UniformLocation()
+ VariableLocation()
{
}
- UniformLocation(const std::string &name, unsigned int element, unsigned int index);
+ VariableLocation(const std::string &name, unsigned int element, unsigned int index);
std::string name;
unsigned int element;
@@ -204,7 +204,7 @@
UniformArray mUniforms;
UniformBlockArray mUniformBlocks;
- typedef std::vector<UniformLocation> UniformIndex;
+ typedef std::vector<VariableLocation> UniformIndex;
UniformIndex mUniformIndex;
bool mValidated;