summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-13 12:53:20 -0600
committerBrian Paul <brianp@vmware.com>2009-08-13 12:53:20 -0600
commit741869d73aa8c9d0d9ae8f1c4ca2df32e235960a (patch)
tree1440ff4c607c392a5ab7bd6fa52ece6560d43f5a
parentae99e4c67ebc3adb0b71e427723f34085801c3ac (diff)
progs/util: ignore pre-defined uniforms in SetUniformValues()
-rw-r--r--progs/util/shaderutil.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 233252112a..489e71cc30 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -153,7 +153,14 @@ SetUniformValues(GLuint program, struct uniform_info uniforms[])
glUniform4fv(uniforms[i].location, 1, uniforms[i].value);
break;
default:
- abort();
+ if (strncmp(uniforms[i].name, "gl_", 3) == 0) {
+ /* built-in uniform: ignore */
+ }
+ else {
+ fprintf(stderr,
+ "Unexpected uniform data type in SetUniformValues\n");
+ abort();
+ }
}
}
}