Mesa (gallium-mesa-7.4): glsl: fix inequality in set_program_uniform()
Alan Hourihane
alanh at kemper.freedesktop.org
Thu Feb 19 10:49:59 UTC 2009
Module: Mesa
Branch: gallium-mesa-7.4
Commit: a7f062f6bcaf87a6471af7710be828bc69a529de
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7f062f6bcaf87a6471af7710be828bc69a529de
Author: Brian Paul <brianp at vmware.com>
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 1bfb952..c64d4ba 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1631,7 +1631,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;
}
More information about the mesa-commit
mailing list