From 01b79b2e3be506ca1fc5708fcfdb497d3ff19145 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 17 May 2013 10:41:27 -0700 Subject: [PATCH] i965: Add cases for ir_triop_vector_insert that assert. brw_link_shader() unconditionally calls lower_vector_insert() with true as the second parameter. This means that both constant and variable indexed expressions will get lowered, so we should never see this in the backend. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 1 + src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 4 ++++ 2 files changed, 5 insertions(+) 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 ea714ec..4afae24 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -403,6 +403,7 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir) case ir_unop_unpack_unorm_4x8: case ir_unop_unpack_half_2x16: case ir_binop_vector_extract: + case ir_triop_vector_insert: case ir_quadop_bitfield_insert: case ir_quadop_vector: assert(!"should have been lowered"); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index f7dd333..b2f8f00 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1702,6 +1702,10 @@ vec4_visitor::visit(ir_expression *ir) emit(BFE(result_dst, op[2], op[1], op[0])); break; + case ir_triop_vector_insert: + assert(!"should have been lowered by lower_vector_insert"); + break; + case ir_quadop_bitfield_insert: assert(!"not reached: should be handled by " "bitfield_insert_to_bfm_bfi\n"); -- 2.7.4