From cef777939091e710161d3802572e7723b0815142 Mon Sep 17 00:00:00 2001 From: Alexis Hetu Date: Thu, 10 Sep 2015 16:55:03 -0400 Subject: [PATCH] Fixed uint uniforms MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Nicolas Capens --- src/OpenGL/libGLESv2/Program.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenGL/libGLESv2/Program.cpp b/src/OpenGL/libGLESv2/Program.cpp index 18fa089d4..800e82db5 100644 --- a/src/OpenGL/libGLESv2/Program.cpp +++ b/src/OpenGL/libGLESv2/Program.cpp @@ -681,7 +681,7 @@ namespace es2 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 @@ namespace es2 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); -- 2.11.0