diff options
| author | Eric Anholt <eric@anholt.net> | 2012-07-20 16:49:15 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-08-07 13:54:50 -0700 |
| commit | af3fc6bb2836ce545c624bce2b47c3fd8cf4f9fa (patch) | |
| tree | ed604cfbbc4d6ef32bd7550e4859433a8328eab5 /src | |
| parent | 56e82e30cb60368bb3605f95130732f5edbab0a0 (diff) | |
| download | external_mesa3d-af3fc6bb2836ce545c624bce2b47c3fd8cf4f9fa.zip external_mesa3d-af3fc6bb2836ce545c624bce2b47c3fd8cf4f9fa.tar.gz external_mesa3d-af3fc6bb2836ce545c624bce2b47c3fd8cf4f9fa.tar.bz2 | |
ir_to_mesa: Don't whack the ->location field of uniform block variables.
Fixes some failures in GL_ARB_uniform_buffer_object/maxblocks.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 70c4cc8..d675da2 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2459,7 +2459,7 @@ _mesa_generate_parameters_list_for_uniforms(struct gl_shader_program ir_variable *var = ((ir_instruction *) node)->as_variable(); if ((var == NULL) || (var->mode != ir_var_uniform) - || (strncmp(var->name, "gl_", 3) == 0)) + || var->uniform_block != -1 || (strncmp(var->name, "gl_", 3) == 0)) continue; add.process(var); |