Module: Mesa Branch: mesa_7_4_branch Commit: c983abbb9e320bebace06892498d83a77b9c397f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c983abbb9e320bebace06892498d83a77b9c397f
Author: Brian Paul <[email protected]> Date: Wed Feb 18 17:52:47 2009 -0700 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) --- src/mesa/shader/shader_api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c index 663aac5..8b19afd 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
