Rename UniformComponentCount to UniformExternalComponentCount

src/libGLESv2/Program.cpp

@@ -933,7 +933,7 @@ bool Program::getUniformfv(GLint location, GLfloat *params)
         break;
       default:
         {
-            unsigned int count = UniformComponentCount(targetUniform->type);
+            unsigned int count = UniformExternalComponentCount(targetUniform->type);
             unsigned int internalCount = UniformInternalComponentCount(targetUniform->type);
 
             switch (UniformComponentType(targetUniform->type))
@@ -998,7 +998,7 @@ bool Program::getUniformiv(GLint location, GLint *params)
         break;
       default:
         {
-            unsigned int count = UniformComponentCount(targetUniform->type);
+            unsigned int count = UniformExternalComponentCount(targetUniform->type);
             unsigned int internalCount = UniformInternalComponentCount(targetUniform->type);
 
             switch (UniformComponentType(targetUniform->type))

src/libGLESv2/utilities.cpp

@@ -20,7 +20,8 @@
 namespace gl
 {
 
-int UniformComponentCount(GLenum type)
+// This is how much data the application expects for a uniform
+int UniformExternalComponentCount(GLenum type)
 {
     switch (type)
     {

src/libGLESv2/utilities.h

@@ -21,7 +21,7 @@ namespace gl
 
 struct Color;
 
-int UniformComponentCount(GLenum type);
+int UniformExternalComponentCount(GLenum type);
 int UniformInternalComponentCount(GLenum type);
 GLenum UniformComponentType(GLenum type);
 size_t UniformTypeSize(GLenum type);