commit 78f4180564b36fbb3ab21f298b12e2a1c8b18fcf
author Jamie Madill <jmadill@chromium.org> Mon Aug 25 15:47:55 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Aug 27 20:47:06 2014 +0000
tree 3b3662cff7ec0af27fb68f14984d1cb0ac927815
parent 99a1e985196cab0ab309209fe8319f6bdbe1dd20

Refactor GetUniform validator helpers.

BUG=angle:571

Change-Id: I7b36c7af38b102a24dc0e5d5d87fc042533e90af
Reviewed-on: https://chromium-review.googlesource.com/212933
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/validationES.cpp

diff --git a/src/libGLESv2/validationES.cpp b/src/libGLESv2/validationES.cpp
index 7f957d0..0b7beb7 100644
--- a/src/libGLESv2/validationES.cpp
+++ b/src/libGLESv2/validationES.cpp
@@ -1671,7 +1671,7 @@
     return true;
 }
 
-bool ValidateGetUniformfv(const gl::Context *context, GLuint program, GLint location, GLfloat* params)
+bool ValidateGetUniformBase(const gl::Context *context, GLuint program, GLint location)
 {
     if (program == 0)
     {
@@ -1694,22 +1694,29 @@
     return true;
 }
 
+bool ValidateGetUniformfv(const gl::Context *context, GLuint program, GLint location, GLfloat* params)
+{
+    return ValidateGetUniformBase(context, program, location);
+}
+
 bool ValidateGetUniformiv(const gl::Context *context, GLuint program, GLint location, GLint* params)
 {
-    if (program == 0)
+    return ValidateGetUniformBase(context, program, location);
+}
+
+static bool ValidateSizedGetUniform(const gl::Context *context, GLuint program, GLint location, GLsizei bufSize)
+{
+    if (!ValidateGetUniformBase(context, program, location))
     {
-        return gl::error(GL_INVALID_VALUE, false);
+        return false;
     }
 
-    gl::Program *programObject = context->getProgram(program);
+    gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
 
-    if (!programObject || !programObject->isLinked())
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    gl::ProgramBinary *programBinary = programObject->getProgramBinary();
-    if (!programBinary)
+    // sized queries -- ensure the provided buffer is large enough
+    LinkedUniform *uniform = programBinary->getUniformByLocation(location);
+    size_t requiredBytes = VariableExternalSize(uniform->type);
+    if (static_cast<size_t>(bufSize) < requiredBytes)
     {
         return gl::error(GL_INVALID_OPERATION, false);
     }
@@ -1719,64 +1726,12 @@
 
 bool ValidateGetnUniformfvEXT(const gl::Context *context, GLuint program, GLint location, GLsizei bufSize, GLfloat* params)
 {
-    if (program == 0)
-    {
-        return gl::error(GL_INVALID_VALUE, false);
-    }
-
-    gl::Program *programObject = context->getProgram(program);
-
-    if (!programObject || !programObject->isLinked())
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    gl::ProgramBinary *programBinary = programObject->getProgramBinary();
-    if (!programBinary)
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    // sized queries -- ensure the provided buffer is large enough
-    LinkedUniform *uniform = programBinary->getUniformByLocation(location);
-    size_t requiredBytes = VariableExternalSize(uniform->type);
-    if (static_cast<size_t>(bufSize) < requiredBytes)
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    return true;
+    return ValidateSizedGetUniform(context, program, location, bufSize);
 }
 
 bool ValidateGetnUniformivEXT(const gl::Context *context, GLuint program, GLint location, GLsizei bufSize, GLint* params)
 {
-    if (program == 0)
-    {
-        return gl::error(GL_INVALID_VALUE, false);
-    }
-
-    gl::Program *programObject = context->getProgram(program);
-
-    if (!programObject || !programObject->isLinked())
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    gl::ProgramBinary *programBinary = programObject->getProgramBinary();
-    if (!programBinary)
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    // sized queries -- ensure the provided buffer is large enough
-    LinkedUniform *uniform = programBinary->getUniformByLocation(location);
-    size_t requiredBytes = VariableExternalSize(uniform->type);
-    if (static_cast<size_t>(bufSize) < requiredBytes)
-    {
-        return gl::error(GL_INVALID_OPERATION, false);
-    }
-
-    return true;
+    return ValidateSizedGetUniform(context, program, location, bufSize);
 }
 
 }