Mesa (master): main: fix a regression in uniform handling introduced by 87a4bc5
Martin Peres
mperes at kemper.freedesktop.org
Thu Jun 4 12:42:44 UTC 2015
Module: Mesa
Branch: master
Commit: 71e94578779e4344066d434004fd85ca493de552
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=71e94578779e4344066d434004fd85ca493de552
Author: Martin Peres <martin.peres at linux.intel.com>
Date: Thu Jun 4 14:09:31 2015 +0300
main: fix a regression in uniform handling introduced by 87a4bc5
The comment was accurate but the condition was reversed...
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
---
src/mesa/program/ir_to_mesa.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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) {
More information about the mesa-commit
mailing list