Refactor Uniform validation to validationES.cpp.

src/libGLESv2/validationES.cpp

@@ -946,40 +946,56 @@ bool ValidateEndQuery(gl::Context *context, GLenum target)
     return true;
 }
 
-bool ValidateUniformMatrix(gl::Context *context, GLenum matrixType, GLint location, GLsizei count,
-                           GLboolean transpose)
+static bool ValidateUniformCommonBase(gl::Context *context, GLint location, GLsizei count)
 {
     if (count < 0)
     {
         return gl::error(GL_INVALID_VALUE, false);
     }
 
-    // Check for ES3 uniform entry points
-    int rows = VariableRowCount(matrixType);
-    int cols = VariableColumnCount(matrixType);
-    if (rows != cols && context->getClientVersion() < 3)
+    gl::ProgramBinary *programBinary = context->getCurrentProgramBinary();
+    if (!programBinary)
     {
         return gl::error(GL_INVALID_OPERATION, false);
     }
 
-    if (transpose != GL_FALSE && context->getClientVersion() < 3)
+    if (location == -1)
     {
-        return gl::error(GL_INVALID_VALUE, false);
+        // Silently ignore the uniform command
+        return false;
     }
 
-    gl::ProgramBinary *programBinary = context->getCurrentProgramBinary();
-    if (!programBinary)
+    return true;
+}
+
+bool ValidateUniform(gl::Context *context, GLenum uniformType, GLint location, GLsizei count)
+{
+    // Check for ES3 uniform entry points
+    if (UniformComponentType(uniformType) == GL_UNSIGNED_INT && context->getClientVersion() < 3)
     {
         return gl::error(GL_INVALID_OPERATION, false);
     }
 
-    if (location == -1)
+    return ValidateUniformCommonBase(context, location, count);
+}
+
+bool ValidateUniformMatrix(gl::Context *context, GLenum matrixType, GLint location, GLsizei count,
+                           GLboolean transpose)
+{
+    // Check for ES3 uniform entry points
+    int rows = VariableRowCount(matrixType);
+    int cols = VariableColumnCount(matrixType);
+    if (rows != cols && context->getClientVersion() < 3)
     {
-        // Silently ignore the uniform command
-        return false;
+        return gl::error(GL_INVALID_OPERATION, false);
     }
 
-    return true;
+    if (transpose != GL_FALSE && context->getClientVersion() < 3)
+    {
+        return gl::error(GL_INVALID_VALUE, false);
+    }
+
+    return ValidateUniformCommonBase(context, location, count);
 }
 
 }

src/libGLESv2/validationES.h

@@ -48,6 +48,7 @@ bool ValidateReadPixelsParameters(gl::Context *context, GLint x, GLint y, GLsize
 bool ValidateBeginQuery(gl::Context *context, GLenum target, GLuint id);
 bool ValidateEndQuery(gl::Context *context, GLenum target);
 
+bool ValidateUniform(gl::Context *context, GLenum uniformType, GLint location, GLsizei count);
 bool ValidateUniformMatrix(gl::Context *context, GLenum matrixType, GLint location, GLsizei count,
                            GLboolean transpose);