From: Eric Anholt <eric@anholt.net>
Date: Fri, 20 Jul 2012 23:49:15 +0000 (-0700)
Subject: ir_to_mesa: Don't whack the ->location field of uniform block variables.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af3fc6bb2836ce545c624bce2b47c3fd8cf4f9fa;p=mesa.git

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>
---

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 70c4cc8aec1..d675da269a4 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);