Refactor Uniform validation to validationES.cpp.

This patch also incidentally fixes some bugged validation in the new ES3 unsigned int uniform API entry points. BUG=angle:571 Change-Id: I89bd909467bd9418fe5ce3f246561765cf27a5e9 Reviewed-on: https://chromium-review.googlesource.com/200074Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Refactor Uniform validation to validationES.cpp.
aa981bd7 · Jamie Madill · d7c7bb27 · aa981bd7 · aa981bd7 · aa981bd7
Commit aa981bd7 authored May 20, 2014 by Jamie Madill
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 63 additions and 146 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +32 -132

validationES.cpp src/libGLESv2/validationES.cpp +30 -14

validationES.h src/libGLESv2/validationES.h +1 -0

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
--- a/src/libGLESv2/validationES.cpp
+++ b/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,
+static bool ValidateUniformCommonBase(gl::Context *context, GLint location, GLsizei count)
-                           GLboolean transpose)
 {
    if (count < 0)
    {
        return gl::error(GL_INVALID_VALUE, false);
    }
-    // Check for ES3 uniform entry points
+    gl::ProgramBinary *programBinary = context->getCurrentProgramBinary();
-    int rows = VariableRowCount(matrixType);
+    if (!programBinary)
-    int cols = VariableColumnCount(matrixType);
-    if (rows != cols && context->getClientVersion() < 3)
    {
        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();
+    return true;
-    if (!programBinary)
+}
+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 gl::error(GL_INVALID_OPERATION, false);
-        return false;
    }
-    return true;
+    if (transpose != GL_FALSE && context->getClientVersion() < 3)
+    {
+        return gl::error(GL_INVALID_VALUE, false);
+    }
+    return ValidateUniformCommonBase(context, location, count);
 }
 }
--- a/src/libGLESv2/validationES.h
+++ b/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);