From 4f82aad7a27e44314b0fd2461819d31efb49fd5e Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 29 May 2020 21:08:32 -0400 Subject: [PATCH] pan/mdg: Drop the u8 from the colorbuf op names Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/midgard/midgard.h | 6 +++--- src/panfrost/midgard/midgard_compile.c | 4 ++-- src/panfrost/midgard/midgard_ops.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h index 705bbd386cb..1dfa7e9f257 100644 --- a/src/panfrost/midgard/midgard.h +++ b/src/panfrost/midgard/midgard.h @@ -477,8 +477,8 @@ typedef enum { midgard_op_ld_vary_32u = 0x9A, midgard_op_ld_vary_32i = 0x9B, - /* Old version of midgard_op_ld_color_buffer_u8_as_fp16, for T720 */ - midgard_op_ld_color_buffer_u8_as_fp16_old = 0x9D, + /* Old version of midgard_op_ld_color_buffer_as_fp16, for T720 */ + midgard_op_ld_color_buffer_as_fp16_old = 0x9D, /* The distinction between these ops is the alignment requirement / * accompanying shift. Thus, the offset to ld_ubo_int4 is in 16-byte @@ -495,7 +495,7 @@ typedef enum { midgard_op_ld_ubo_int4 = 0xB0, /* New-style blending ops. Works on T760/T860 */ - midgard_op_ld_color_buffer_u8_as_fp16 = 0xB9, + midgard_op_ld_color_buffer_as_fp16 = 0xB9, midgard_op_ld_color_buffer_32u = 0xBA, midgard_op_st_char = 0xC0, diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 804a32f5f10..233f23f44d7 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -1578,8 +1578,8 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr) if (instr->intrinsic == nir_intrinsic_load_output_u8_as_fp16_pan) { ld.load_store.op = old_blend ? - midgard_op_ld_color_buffer_u8_as_fp16_old : - midgard_op_ld_color_buffer_u8_as_fp16; + midgard_op_ld_color_buffer_as_fp16_old : + midgard_op_ld_color_buffer_as_fp16; if (old_blend) { ld.load_store.address = 1; diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c index 916cf4488df..dc30eceec2d 100644 --- a/src/panfrost/midgard/midgard_ops.c +++ b/src/panfrost/midgard/midgard_ops.c @@ -227,8 +227,8 @@ struct mir_ldst_op_props load_store_opcode_props[256] = { [midgard_op_ld_vary_32u] = {"ld_vary_32u", M32}, [midgard_op_ld_color_buffer_32u] = {"ld_color_buffer_32u", M32}, - [midgard_op_ld_color_buffer_u8_as_fp16] = {"ld_color_buffer_u8_as_fp16", M16}, - [midgard_op_ld_color_buffer_u8_as_fp16_old] = {"ld_color_buffer_u8_as_fp16_old", M16 | LDST_SPECIAL_MASK}, + [midgard_op_ld_color_buffer_as_fp16] = {"ld_color_buffer_as_fp16", M16}, + [midgard_op_ld_color_buffer_as_fp16_old] = {"ld_color_buffer_as_fp16_old", M16 | LDST_SPECIAL_MASK}, [midgard_op_ld_ubo_char] = {"ld_ubo_char", M32}, [midgard_op_ld_ubo_char2] = {"ld_ubo_char2", M16}, -- 2.30.2