Commit cef77793 by Alexis Hetu Committed by Alexis Hétu

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/3963Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 0e12a92c
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment