Implements Uniform*i{v}

src/libGLESv2/Program.h

@@ -65,6 +65,9 @@ class Program
     bool setUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value);
     bool setUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value);
     bool setUniform1iv(GLint location, GLsizei count, const GLint *v);
+    bool setUniform2iv(GLint location, GLsizei count, const GLint *v);
+    bool setUniform3iv(GLint location, GLsizei count, const GLint *v);
+    bool setUniform4iv(GLint location, GLsizei count, const GLint *v);
 
     void applyUniforms();
 
@@ -118,6 +121,9 @@ class Program
     bool applyUniformMatrix3fv(GLint location, GLsizei count, const GLfloat *value);
     bool applyUniformMatrix4fv(GLint location, GLsizei count, const GLfloat *value);
     bool applyUniform1iv(GLint location, GLsizei count, const GLint *v);
+    bool applyUniform2iv(GLint location, GLsizei count, const GLint *v);
+    bool applyUniform3iv(GLint location, GLsizei count, const GLint *v);
+    bool applyUniform4iv(GLint location, GLsizei count, const GLint *v);
 
     void appendToInfoLog(const char *info);
 

src/libGLESv2/libGLESv2.cpp

@@ -3472,14 +3472,14 @@ void __stdcall glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
 
     try
     {
-        if (location == -1)
+        if (count < 0)
         {
-            return;
+            return error(GL_INVALID_VALUE);
         }
 
-        if (count < 0)
+        if (location == -1)
         {
-            return error(GL_INVALID_VALUE);
+            return;
         }
 
         gl::Context *context = gl::getContext();
@@ -3521,6 +3521,11 @@ void __stdcall glUniform1iv(GLint location, GLsizei count, const GLint* v)
             return error(GL_INVALID_VALUE);
         }
 
+        if (location == -1)
+        {
+            return;
+        }
+
         gl::Context *context = gl::getContext();
 
         if (context)
@@ -3557,14 +3562,14 @@ void __stdcall glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
 
     try
     {
-        if (location == -1)
+        if (count < 0)
         {
-            return;
+            return error(GL_INVALID_VALUE);
         }
         
-        if (count < 0)
+        if (location == -1)
         {
-            return error(GL_INVALID_VALUE);
+            return;
         }
 
         gl::Context *context = gl::getContext();
@@ -3608,7 +3613,27 @@ void __stdcall glUniform2iv(GLint location, GLsizei count, const GLint* v)
             return error(GL_INVALID_VALUE);
         }
 
-        UNIMPLEMENTED();   // FIXME
+        if (location == -1)
+        {
+            return;
+        }
+
+        gl::Context *context = gl::getContext();
+
+        if (context)
+        {
+            gl::Program *program = context->getCurrentProgram();
+
+            if (!program)
+            {
+                return error(GL_INVALID_OPERATION);
+            }
+
+            if (!program->setUniform2iv(location, count, v))
+            {
+                return error(GL_INVALID_OPERATION);
+            }
+        }
     }
     catch(std::bad_alloc&)
     {
@@ -3680,7 +3705,27 @@ void __stdcall glUniform3iv(GLint location, GLsizei count, const GLint* v)
             return error(GL_INVALID_VALUE);
         }
 
-        UNIMPLEMENTED();   // FIXME
+        if (location == -1)
+        {
+            return;
+        }
+
+        gl::Context *context = gl::getContext();
+
+        if (context)
+        {
+            gl::Program *program = context->getCurrentProgram();
+
+            if (!program)
+            {
+                return error(GL_INVALID_OPERATION);
+            }
+
+            if (!program->setUniform3iv(location, count, v))
+            {
+                return error(GL_INVALID_OPERATION);
+            }
+        }
     }
     catch(std::bad_alloc&)
     {
@@ -3752,7 +3797,27 @@ void __stdcall glUniform4iv(GLint location, GLsizei count, const GLint* v)
             return error(GL_INVALID_VALUE);
         }
 
-        UNIMPLEMENTED();   // FIXME
+        if (location == -1)
+        {
+            return;
+        }
+
+        gl::Context *context = gl::getContext();
+
+        if (context)
+        {
+            gl::Program *program = context->getCurrentProgram();
+
+            if (!program)
+            {
+                return error(GL_INVALID_OPERATION);
+            }
+
+            if (!program->setUniform4iv(location, count, v))
+            {
+                return error(GL_INVALID_OPERATION);
+            }
+        }
     }
     catch(std::bad_alloc&)
     {