Move GetUniform size validation to top layer.

src/libGLESv2/ProgramBinary.cpp

@@ -841,20 +841,10 @@ void ProgramBinary::setUniform4uiv(GLint location, GLsizei count, const GLuint *
 }
 
 template <typename T>
-bool ProgramBinary::getUniformv(GLint location, GLsizei *bufSize, T *params, GLenum uniformType)
+void ProgramBinary::getUniformv(GLint location, T *params, GLenum uniformType)
 {
     LinkedUniform *targetUniform = mUniforms[mUniformIndex[location].index];
 
-    // sized queries -- ensure the provided buffer is large enough
-    if (bufSize)
-    {
-        int requiredBytes = VariableExternalSize(targetUniform->type);
-        if (*bufSize < requiredBytes)
-        {
-            return false;
-        }
-    }
-
     if (IsMatrixType(targetUniform->type))
     {
         const int rows = VariableRowCount(targetUniform->type);
@@ -919,23 +909,21 @@ bool ProgramBinary::getUniformv(GLint location, GLsizei *bufSize, T *params, GLe
           default: UNREACHABLE();
         }
     }
-
-    return true;
 }
 
-bool ProgramBinary::getUniformfv(GLint location, GLsizei *bufSize, GLfloat *params)
+void ProgramBinary::getUniformfv(GLint location, GLfloat *params)
 {
-    return getUniformv(location, bufSize, params, GL_FLOAT);
+    getUniformv(location, params, GL_FLOAT);
 }
 
-bool ProgramBinary::getUniformiv(GLint location, GLsizei *bufSize, GLint *params)
+void ProgramBinary::getUniformiv(GLint location, GLint *params)
 {
-    return getUniformv(location, bufSize, params, GL_INT);
+    getUniformv(location, params, GL_INT);
 }
 
-bool ProgramBinary::getUniformuiv(GLint location, GLsizei *bufSize, GLuint *params)
+void ProgramBinary::getUniformuiv(GLint location, GLuint *params)
 {
-    return getUniformv(location, bufSize, params, GL_UNSIGNED_INT);
+    getUniformv(location, params, GL_UNSIGNED_INT);
 }
 
 void ProgramBinary::dirtyAllUniforms()

src/libGLESv2/ProgramBinary.h

@@ -125,9 +125,9 @@ class ProgramBinary : public RefCountObject
     void setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
     void setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
 
-    bool getUniformfv(GLint location, GLsizei *bufSize, GLfloat *params);
-    bool getUniformiv(GLint location, GLsizei *bufSize, GLint *params);
-    bool getUniformuiv(GLint location, GLsizei *bufSize, GLuint *params);
+    void getUniformfv(GLint location, GLfloat *params);
+    void getUniformiv(GLint location, GLint *params);
+    void getUniformuiv(GLint location, GLuint *params);
 
     void dirtyAllUniforms();
     void applyUniforms();
@@ -234,7 +234,7 @@ class ProgramBinary : public RefCountObject
     void setUniformMatrixfv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value, GLenum targetUniformType);
 
     template <typename T>
-    bool getUniformv(GLint location, GLsizei *bufSize, T *params, GLenum uniformType);
+    void getUniformv(GLint location, T *params, GLenum uniformType);
 
     class VertexExecutable
     {

src/libGLESv2/libGLESv2.cpp

@@ -3022,10 +3022,7 @@ void __stdcall glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSiz
         gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
         ASSERT(programBinary);
 
-        if (!programBinary->getUniformfv(location, &bufSize, params))
-        {
-            return gl::error(GL_INVALID_OPERATION);
-        }
+        programBinary->getUniformfv(location, params);
     }
 }
 
@@ -3045,10 +3042,7 @@ void __stdcall glGetUniformfv(GLuint program, GLint location, GLfloat* params)
         gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
         ASSERT(programBinary);
 
-        if (!programBinary->getUniformfv(location, NULL, params))
-        {
-            return gl::error(GL_INVALID_OPERATION);
-        }
+        programBinary->getUniformfv(location, params);
     }
 }
 
@@ -3074,10 +3068,7 @@ void __stdcall glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSiz
         gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
         ASSERT(programBinary);
 
-        if (!programBinary->getUniformiv(location, &bufSize, params))
-        {
-            return gl::error(GL_INVALID_OPERATION);
-        }
+        programBinary->getUniformiv(location, params);
     }
 }
 
@@ -3097,10 +3088,7 @@ void __stdcall glGetUniformiv(GLuint program, GLint location, GLint* params)
         gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
         ASSERT(programBinary);
 
-        if (!programBinary->getUniformiv(location, NULL, params))
-        {
-            return gl::error(GL_INVALID_OPERATION);
-        }
+        programBinary->getUniformiv(location, params);
     }
 }
 
@@ -6219,10 +6207,7 @@ void __stdcall glGetUniformuiv(GLuint program, GLint location, GLuint* params)
         gl::ProgramBinary *programBinary = context->getState().getCurrentProgramBinary();
         ASSERT(programBinary);
 
-        if (!programBinary->getUniformuiv(location, NULL, params))
-        {
-            return gl::error(GL_INVALID_OPERATION);
-        }
+        programBinary->getUniformuiv(location, params);
     }
 }
 

src/libGLESv2/validationES.cpp

@@ -1737,6 +1737,14 @@ bool ValidateGetnUniformfvEXT(const gl::Context *context, GLuint program, GLint
         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;
 }
 
@@ -1760,6 +1768,14 @@ bool ValidateGetnUniformivEXT(const gl::Context *context, GLuint program, GLint
         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;
 }