diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-18 14:07:38 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-18 14:07:38 -0700 |
| commit | 654258a4fe5e7114022c6e02f2844fc469fcc6f3 (patch) | |
| tree | 89d285becb87659ab61ee0ceeb35c76726ae93d2 /src/mesa/shader/prog_execute.c | |
| parent | 64adeb163d7da6d75b5664cd2ee3783cadaf63d8 (diff) | |
| parent | cf29ab3ba075905cca786b52617d7dc993f58033 (diff) | |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/shader/prog_execute.c')
| -rw-r--r-- | src/mesa/shader/prog_execute.c | 3 |
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; |