From ee7c9368710d3fcc1937ebf20942b67015551cf5 Mon Sep 17 00:00:00 2001 From: "Kristian H. Kristensen" Date: Tue, 29 Nov 2016 17:09:47 -0800 Subject: assembler: Fix assert when setting 3src sources We need to map the type to the 3src encoding before comparing to insn->bits1.da3src.src_reg_type, which is 3src encoded. Signed-off-by: Kristian H. Kristensen Reviewed-by: Lionel Landwerlin --- assembler/brw_eu_emit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'assembler') diff --git a/assembler/brw_eu_emit.c b/assembler/brw_eu_emit.c index 23f0da5f..d4fadffa 100644 --- a/assembler/brw_eu_emit.c +++ b/assembler/brw_eu_emit.c @@ -874,7 +874,7 @@ brw_set_3src_src1(struct brw_compile *p, assert(src1.file == BRW_GENERAL_REGISTER_FILE); assert(src1.address_mode == BRW_ADDRESS_DIRECT); assert(src1.nr < 128); - assert(src1.type == insn->bits1.da3src.src_reg_type); + assert(get_3src_type(src1.type) == insn->bits1.da3src.src_reg_type); insn->bits2.da3src.src1_swizzle = src1.dw1.bits.swizzle; insn->bits2.da3src.src1_subreg_nr_low = get_3src_subreg_nr(src1) & 0x3; insn->bits3.da3src.src1_subreg_nr_high = get_3src_subreg_nr(src1) >> 2; @@ -892,7 +892,7 @@ brw_set_3src_src2(struct brw_compile *p, assert(src2.file == BRW_GENERAL_REGISTER_FILE); assert(src2.address_mode == BRW_ADDRESS_DIRECT); assert(src2.nr < 128); - assert(src2.type == insn->bits1.da3src.src_reg_type); + assert(get_3src_type(src2.type) == insn->bits1.da3src.src_reg_type); insn->bits3.da3src.src2_swizzle = src2.dw1.bits.swizzle; insn->bits3.da3src.src2_subreg_nr = get_3src_subreg_nr(src2); insn->bits3.da3src.src2_rep_ctrl = src2.vstride == BRW_VERTICAL_STRIDE_0; -- cgit v1.2.3