Mesa (7.10): ir_to_mesa: Don' t generate swizzles for record derefs of non-scalar/vectors

[Ian Romanick]

Module: Mesa
Branch: 7.10
Commit: 3501fd85942dc905de53710e3a57f16641e4e70d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3501fd85942dc905de53710e3a57f16641e4e70d

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Dec 13 15:42:46 2010 -0800

ir_to_mesa: Don't generate swizzles for record derefs of non-scalar/vectors

This is the same as what the array dereference handler does.

Fixes piglit test glsl-link-struct-array (bugzilla #31648).

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 2d577ee730c30caacf711babde6542766aa0b655)

---

 src/mesa/program/ir_to_mesa.cpp |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index b274a96..490c4ca 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1569,7 +1569,13 @@ ir_to_mesa_visitor::visit(ir_dereference_record *ir)
 	 break;
       offset += type_size(struct_type->fields.structure[i].type);
    }
-   this->result.swizzle = swizzle_for_size(ir->type->vector_elements);
+
+   /* If the type is smaller than a vec4, replicate the last channel out. */
+   if (ir->type->is_scalar() || ir->type->is_vector())
+      this->result.swizzle = swizzle_for_size(ir->type->vector_elements);
+   else
+      this->result.swizzle = SWIZZLE_NOOP;
+
    this->result.index += offset;
 }