summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Forbes <chrisf@ijw.co.nz>2013-11-17 20:07:46 +1300
committerChris Forbes <chrisf@ijw.co.nz>2014-07-13 10:01:22 +1200
commit5ed147c26f800ffb11fb80b92aec9a772982aff6 (patch)
treecfbabd76e0d41816659eb40f685dd40c9931b6d4
parent6e91f2df958c835a1973e32d71578fa295ef00a8 (diff)
i965/fs: Skip channel expressions splitting for interpolation
The backend will have to do a message send, so we want to keep these in one piece, just like texture ops. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
index 9fe0ffc1078..4113f475f60 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
@@ -75,6 +75,18 @@ channel_expressions_predicate(ir_instruction *ir)
if (!expr)
return false;
+ switch (expr->operation) {
+ /* these opcodes need to act on the whole vector,
+ * just like texturing.
+ */
+ case ir_unop_interpolate_at_centroid:
+ case ir_binop_interpolate_at_offset:
+ case ir_binop_interpolate_at_sample:
+ return false;
+ default:
+ break;
+ }
+
for (i = 0; i < expr->get_num_operands(); i++) {
if (expr->operands[i]->type->is_vector())
return true;
@@ -153,6 +165,16 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
if (!found_vector)
return visit_continue;
+ switch (expr->operation) {
+ case ir_unop_interpolate_at_centroid:
+ case ir_binop_interpolate_at_offset:
+ case ir_binop_interpolate_at_sample:
+ return visit_continue;
+
+ default:
+ break;
+ }
+
/* Store the expression operands in temps so we can use them
* multiple times.
*/
@@ -414,6 +436,9 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
case ir_unop_unpack_half_2x16_split_x:
case ir_unop_unpack_half_2x16_split_y:
case ir_binop_pack_half_2x16_split:
+ case ir_unop_interpolate_at_centroid:
+ case ir_binop_interpolate_at_offset:
+ case ir_binop_interpolate_at_sample:
unreachable("not reached: expression operates on scalars only");
}