projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
effb73b
)
glsl: allow uniforms
author
Zack Rusin
<zack@tungstengraphics.com>
Thu, 12 Jun 2008 23:37:26 +0000
(19:37 -0400)
committer
Zack Rusin
<zack@tungstengraphics.com>
Thu, 12 Jun 2008 23:37:26 +0000
(19:37 -0400)
src/mesa/shader/prog_execute.c
patch
|
blob
|
history
diff --git
a/src/mesa/shader/prog_execute.c
b/src/mesa/shader/prog_execute.c
index
8ce2ca3
..
4575a06
100644
(file)
--- 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;