summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2008-06-12 19:37:26 -0400
committerZack Rusin <zack@tungstengraphics.com>2008-06-12 19:37:26 -0400
commit53f5b9741a5453f9166aee8da6e1f8bf5b10d59e (patch)
tree63963c98208361248a705ee62fb10649f3fdf6b3 /src
parenteffb73befa56099ba78ef2d93be4f980dad157b3 (diff)
glsl: allow uniforms
Diffstat (limited to 'src')
-rw-r--r--src/mesa/shader/prog_execute.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 8ce2ca3964..4575a069ea 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -90,7 +90,8 @@ get_register_pointer(const struct prog_src_register *source,
const struct gl_program_parameter_list *params;
ASSERT(source->File == PROGRAM_LOCAL_PARAM ||
source->File == PROGRAM_CONSTANT ||
- source->File == PROGRAM_STATE_VAR);
+ source->File == PROGRAM_STATE_VAR ||
+ source->File == PROGRAM_UNIFORM);
params = machine->CurProgram->Parameters;
if (reg < 0 || reg >= params->NumParameters)
return ZeroVec;