From: Eric Anholt <eric@anholt.net>
Date: Mon, 23 Aug 2010 17:57:54 +0000 (-0700)
Subject: ir_to_mesa: Fix constant array handling to return the temp we created.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ebef04011736ea8e13692fed87623d425c4d1b08;p=mesa.git

ir_to_mesa: Fix constant array handling to return the temp we created.

We ended up returning CONST[loc] rather than TEMP[loc2].  Things would
*usually* end up working out OK, since the constants often ended up
getting allocated to CONST[loc..loc+columns] with no swizzle.  But for
the case where the contigous temporary copy of the swizzled constant
vec4 args was actually needed, we'd end up reading some other constant
values, possibly including ones not actually allocated.

Fixes: glsl-varying-mat3x2.
---

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 676f68e5a02..17ebdbb220b 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1817,6 +1817,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
       }
 
       this->result = mat;
+      return;
    }
 
    src_reg.file = PROGRAM_CONSTANT;