From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 22 Mar 2012 22:09:40 +0000 (-0700)
Subject: glsl: Request an Nx1 type instance in ir_quadop_vector lowering pass.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d998a2a592ed688c90b408604b9dbec26b752ff;p=mesa.git

glsl: Request an Nx1 type instance in ir_quadop_vector lowering pass.

No types have 0 columns.  The glsl_type::get_instance method contains

   if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))
      return error_type;

To get a vector, use columns = 1.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Olivier Galibert <galibert@pobox.com>
---

diff --git a/src/glsl/lower_vector.cpp b/src/glsl/lower_vector.cpp
index 57963a121ad..0cd6909db55 100644
--- a/src/glsl/lower_vector.cpp
+++ b/src/glsl/lower_vector.cpp
@@ -183,7 +183,7 @@ lower_vector_visitor::handle_rvalue(ir_rvalue **rvalue)
    if (assigned > 0) {
       ir_constant *const c =
 	 new(mem_ctx) ir_constant(glsl_type::get_instance(expr->type->base_type,
-							  assigned, 0),
+							  assigned, 1),
 				  &d);
       ir_dereference *const lhs = new(mem_ctx) ir_dereference_variable(temp);
       ir_assignment *const assign =