summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-18 17:52:47 -0700
committerBrian Paul <brianp@vmware.com>2009-02-18 17:52:47 -0700
commitc983abbb9e320bebace06892498d83a77b9c397f (patch)
tree6ee8dedd84ce39a7206506d0875760ed6e5cbcdf
parenta0a81204c240aedc9d9609148b8e67da3bcf2104 (diff)
glsl: fix inequality in set_program_uniform()
We were off by one when checking for too many uniform values. (cherry picked from master, commit b9d8f717d299c388c0dd238d6315e5becd120406)
-rw-r--r--src/mesa/shader/shader_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 663aac561ce..8b19afd3374 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1624,7 +1624,7 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program,
for (k = 0; k < count; k++) {
GLfloat *uniformVal;
- if (offset + k > slots) {
+ if (offset + k >= slots) {
/* Extra array data is ignored */
break;
}