summaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@linux.intel.com>2015-06-04 14:09:31 +0300
committerMartin Peres <martin.peres@linux.intel.com>2015-06-04 15:42:06 +0300
commit71e94578779e4344066d434004fd85ca493de552 (patch)
tree7e4b8d4991e3e5d4b5e6c2fab731e906d1ebf0f3 /src/mesa/program
parent87a4bc511811327a00f9bbc1b6870b7fa46675f7 (diff)
downloadexternal_mesa3d-71e94578779e4344066d434004fd85ca493de552.zip
external_mesa3d-71e94578779e4344066d434004fd85ca493de552.tar.gz
external_mesa3d-71e94578779e4344066d434004fd85ca493de552.tar.bz2
main: fix a regression in uniform handling introduced by 87a4bc5
The comment was accurate but the condition was reversed... Reviewed-by: Jose Fonseca <jfonseca@vmware.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com> Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/ir_to_mesa.cpp2
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 50b86ad..514bb93 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2410,7 +2410,7 @@ _mesa_associate_uniform_storage(struct gl_context *ctx,
&shader_program->UniformStorage[location];
/* Do not associate any uniform storage to built-in uniforms */
- if (!storage->builtin)
+ if (storage->builtin)
continue;
if (location != last_location) {