commit cef777939091e710161d3802572e7723b0815142
author Alexis Hetu <sugoi@google.com> Thu Sep 10 16:55:03 2015 -0400
committer Alexis Hétu <sugoi@google.com> Wed Sep 23 21:17:23 2015 +0000
tree fc94c93280a21a6d7f0d277414070ebe84e9d2fa
parent 0e12a92c57cda9fb03a3b01a65d3ebe9f41cc743

Fixed uint uniforms

uint uniforms were failing because of a missing condition.
This only affected uint scalars, uint vectors were unaffected.

Change-Id: Ia2338a683f1e6f5f9b6944aae72e2dbec70a8ef2
Reviewed-on: https://swiftshader-review.googlesource.com/3963
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/libGLESv2/Program.cpp

diff --git a/src/OpenGL/libGLESv2/Program.cpp b/src/OpenGL/libGLESv2/Program.cpp
index 18fa089..800e82d 100644
--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -681,7 +681,7 @@
 	

 		count = std::min(size - (int)uniformIndex[location].element, count);

 

-		if(targetUniform->type == GL_INT || IsSamplerUniform(targetUniform->type))

+		if(targetUniform->type == GL_INT || targetUniform->type == GL_UNSIGNED_INT || IsSamplerUniform(targetUniform->type))

 		{

 			memcpy(targetUniform->data + uniformIndex[location].element * sizeof(GLint),

 				   v, sizeof(GLint) * count);

@@ -800,7 +800,7 @@
 	

 		count = std::min(size - (int)uniformIndex[location].element, count);

 

-		if(targetUniform->type == GL_INT || IsSamplerUniform(targetUniform->type))

+		if(targetUniform->type == GL_INT || targetUniform->type == GL_UNSIGNED_INT || IsSamplerUniform(targetUniform->type))

 		{

 			memcpy(targetUniform->data + uniformIndex[location].element * sizeof(GLuint),

 				   v, sizeof(GLuint)* count);