From 64dbc51b497fbd962f1b594c5613dcf56066f03b Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 21 Jan 2013 17:50:41 -0800 Subject: [PATCH] i965: Assert that the 4x8 pack/unpack operations have been lowered Reviewed-by: Chad Versace Reviewed-by: Paul Berry --- src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 4 ++++ src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 4 ++++ src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 4 ++++ 3 files changed, 12 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 e19da51..ea06225 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -343,10 +343,14 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir) break; case ir_unop_pack_snorm_2x16: + case ir_unop_pack_snorm_4x8: case ir_unop_pack_unorm_2x16: + case ir_unop_pack_unorm_4x8: case ir_unop_pack_half_2x16: case ir_unop_unpack_snorm_2x16: + case ir_unop_unpack_snorm_4x8: case ir_unop_unpack_unorm_2x16: + case ir_unop_unpack_unorm_4x8: case ir_unop_unpack_half_2x16: case ir_quadop_vector: assert(!"should have been lowered"); diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 7646d59..d4f6fc9 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -539,9 +539,13 @@ fs_visitor::visit(ir_expression *ir) this->result, op[0], op[1]); break; case ir_unop_pack_snorm_2x16: + case ir_unop_pack_snorm_4x8: case ir_unop_pack_unorm_2x16: + case ir_unop_pack_unorm_4x8: case ir_unop_unpack_snorm_2x16: + case ir_unop_unpack_snorm_4x8: case ir_unop_unpack_unorm_2x16: + case ir_unop_unpack_unorm_4x8: case ir_unop_unpack_half_2x16: case ir_unop_pack_half_2x16: assert(!"not reached: should be handled by lower_packing_builtins"); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 3a2f1d3..1863fe5 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1596,9 +1596,13 @@ vec4_visitor::visit(ir_expression *ir) emit_unpack_half_2x16(result_dst, op[0]); break; case ir_unop_pack_snorm_2x16: + case ir_unop_pack_snorm_4x8: case ir_unop_pack_unorm_2x16: + case ir_unop_pack_unorm_4x8: case ir_unop_unpack_snorm_2x16: + case ir_unop_unpack_snorm_4x8: case ir_unop_unpack_unorm_2x16: + case ir_unop_unpack_unorm_4x8: assert(!"not reached: should be handled by lower_packing_builtins"); break; case ir_unop_unpack_half_2x16_split_x: -- 2.7.4