summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-09-28 15:25:40 -0700
committerEric Anholt <eric@anholt.net>2010-09-28 16:26:49 -0700
commitff0eb45f47ebf2fcc1af06a8b6b934c79dff1d41 (patch)
treeded2046cf8afb99a370119e0a0e862ccabc01883 /src
parent301ab49605e6f3456f437fc2f1b2b141a83a46fc (diff)
i965: Fix array indexing of arrays of matrices.
The deleted code was meant to be handling indexing of a matrix, which would have been a noop if it had been correct.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index feb0cc156cb..2ed5f26ebd8 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -796,12 +796,8 @@ fs_visitor::visit(ir_dereference_array *ir)
ir->array->accept(this);
index = ir->array_index->as_constant();
- if (ir->type->is_matrix()) {
- element_size = ir->type->vector_elements;
- } else {
- element_size = type_size(ir->type);
- this->result.type = brw_type_for_base_type(ir->type);
- }
+ element_size = type_size(ir->type);
+ this->result.type = brw_type_for_base_type(ir->type);
if (index) {
assert(this->result.file == UNIFORM ||
@@ -809,7 +805,7 @@ fs_visitor::visit(ir_dereference_array *ir)
this->result.reg != 0));
this->result.reg_offset += index->value.i[0] * element_size;
} else {
- assert(!"FINISHME: non-constant matrix column");
+ assert(!"FINISHME: non-constant array element");
}
}