[Mesa-dev] [PATCH 2/9] i965/vs: Fix up swizzle for dereference_array of matrices.

[Eric Anholt]

Fixes assertion failure in piglit:
vs-mat2-struct-assignment.shader_test
vs-mat2-array-assignment.shader_test
---
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index a7d71b3..c2b1033 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -1454,7 +1454,7 @@ vec4_visitor::visit(ir_dereference_array *ir)
    }
 
    /* If the type is smaller than a vec4, replicate the last channel out. */
-   if (ir->type->is_scalar() || ir->type->is_vector())
+   if (ir->type->is_scalar() || ir->type->is_vector() || ir->type->is_matrix())
       src.swizzle = swizzle_for_size(ir->type->vector_elements);
    else
       src.swizzle = BRW_SWIZZLE_NOOP;
@@ -1479,7 +1479,7 @@ vec4_visitor::visit(ir_dereference_record *ir)
    }
 
    /* If the type is smaller than a vec4, replicate the last channel out. */
-   if (ir->type->is_scalar() || ir->type->is_vector())
+   if (ir->type->is_scalar() || ir->type->is_vector() || ir->type->is_matrix())
       this->result.swizzle = swizzle_for_size(ir->type->vector_elements);
    else
       this->result.swizzle = BRW_SWIZZLE_NOOP;
-- 
1.7.10