fontconfig libXext mesa xserver pixman git update 31 Jul 2012

1 files changed, 7 insertions, 1 deletions

diff --git a/mesalib/src/glsl/opt_dead_code.cpp b/mesalib/src/glsl/opt_dead_code.cpp
index 0578f1737..de8475f95 100644
--- a/mesalib/src/glsl/opt_dead_code.cpp
+++ b/mesalib/src/glsl/opt_dead_code.cpp
@@ -95,9 +95,15 @@ do_dead_code(exec_list *instructions, bool uniform_locations_assigned)
 	 /* uniform initializers are precious, and could get used by another
 	  * stage.  Also, once uniform locations have been assigned, the
 	  * declaration cannot be deleted.
+	  *
+	  * Also, GL_ARB_uniform_buffer_object says that std140
+	  * uniforms will not be eliminated.  Since we always do
+	  * std140, just don't eliminate uniforms in UBOs.
 	  */
 	 if (entry->var->mode == ir_var_uniform &&
-	     (uniform_locations_assigned || entry->var->constant_value))
+	     (uniform_locations_assigned ||
+	      entry->var->constant_value ||
+	      entry->var->uniform_block != -1))
 	    continue;
 
 	 entry->var->remove();