From: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat, 23 Mar 2013 01:55:49 +0000 (-0700)
Subject: glsl: Generated masked write instead of vector array index for UBO lowering
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e0131196caad52a33e460775fa537fd57a8b29e5;p=mesa.git

glsl: Generated masked write instead of vector array index for UBO lowering

When reading a column from a row-major matrix, we would slot the single
value read into the vector using an ir_dereference_array of the vector
with a constant index.  This will (eventually) get optimized to a
masked-write, so just generate the masked write in the first place.

v2: Remove unused variable 'chan'.  Suggested by Ken.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Eric Anholt <eric@anholt.net>
---

diff --git a/src/glsl/lower_ubo_reference.cpp b/src/glsl/lower_ubo_reference.cpp
index 026197df7a9..aade203e724 100644
--- a/src/glsl/lower_ubo_reference.cpp
+++ b/src/glsl/lower_ubo_reference.cpp
@@ -356,18 +356,14 @@ lower_ubo_reference_visitor::emit_ubo_loads(ir_dereference *deref,
       unsigned matrix_stride = 16;
 
       for (unsigned i = 0; i < deref->type->vector_elements; i++) {
-	 ir_rvalue *chan = new(mem_ctx) ir_constant((int)i);
-	 ir_dereference *deref_chan =
-	    new(mem_ctx) ir_dereference_array(deref->clone(mem_ctx, NULL),
-					      chan);
-
 	 ir_rvalue *chan_offset =
 	    add(base_offset,
 		new(mem_ctx) ir_constant(deref_offset + i * matrix_stride));
 
-	 base_ir->insert_before(assign(deref_chan,
+	 base_ir->insert_before(assign(deref->clone(mem_ctx, NULL),
 				       ubo_load(glsl_type::float_type,
-						chan_offset)));
+						chan_offset),
+				       (1U << i)));
       }
    }
 }