commit 53f5b9741a5453f9166aee8da6e1f8bf5b10d59e
author Zack Rusin <zack@tungstengraphics.com> Thu Jun 12 19:37:26 2008 -0400
committer Zack Rusin <zack@tungstengraphics.com> Thu Jun 12 19:37:26 2008 -0400
tree 63963c98208361248a705ee62fb10649f3fdf6b3
parent effb73befa56099ba78ef2d93be4f980dad157b3

glsl: allow uniforms

src/mesa/shader/prog_execute.c

diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 8ce2ca3..4575a06 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -90,7 +90,8 @@
          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;