Fixes some failures in GL_ARB_uniform_buffer_object/maxblocks.
---
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 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);
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
