diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-01-02 12:28:54 -0500 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2020-01-02 15:20:55 -0500 |
| commit | 2d1e18ee83d88c0d5bd08e8b0cc593ef3d44ea1b (patch) | |
| tree | 4d02b92d149f3410f51d40dccd4718bf42b59373 /src/panfrost | |
| parent | 5063ab6a9c2a20aea0c61d17751da5cd53ca149e (diff) | |
pan/midgard: Identity ld_color_buffer as 32-bit
I'm not sure why I mistakenly identified it as an 8-bit op before.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/midgard/midgard.h | 2 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_compile.c | 4 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_ops.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h index 807f8f1ede9..560c1295135 100644 --- a/src/panfrost/midgard/midgard.h +++ b/src/panfrost/midgard/midgard.h @@ -468,7 +468,7 @@ typedef enum { /* New-style blending ops. Works on T760/T860 */ midgard_op_ld_color_buffer_u8_as_fp16 = 0xB9, - midgard_op_ld_color_buffer_8 = 0xBA, + midgard_op_ld_color_buffer_32u = 0xBA, midgard_op_st_char = 0xC0, midgard_op_st_char2 = 0xC4, /* short */ diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 19da6f44f40..39796d3eb9a 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -205,7 +205,7 @@ M_LOAD(ld_vary_32); M_LOAD(ld_ubo_int4); M_LOAD(ld_int4); M_STORE(st_int4); -M_LOAD(ld_color_buffer_8); +M_LOAD(ld_color_buffer_32u); //M_STORE(st_vary_16); M_STORE(st_vary_32); M_LOAD(ld_cubemap_coords); @@ -1505,7 +1505,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr) /* T720 and below use different blend opcodes with slightly * different semantics than T760 and up */ - midgard_instruction ld = m_ld_color_buffer_8(reg, 0); + midgard_instruction ld = m_ld_color_buffer_32u(reg, 0); bool old_blend = ctx->quirks & MIDGARD_OLD_BLEND; if (instr->intrinsic == nir_intrinsic_load_output_u8_as_fp16_pan) { diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c index 098a330887c..4d33eaa3da4 100644 --- a/src/panfrost/midgard/midgard_ops.c +++ b/src/panfrost/midgard/midgard_ops.c @@ -222,7 +222,7 @@ struct mir_ldst_op_props load_store_opcode_props[256] = { [midgard_op_ld_vary_32i] = {"ld_vary_32i", M32}, [midgard_op_ld_vary_32u] = {"ld_vary_32u", M32}, - [midgard_op_ld_color_buffer_8] = {"ld_color_buffer_8", M8 | LDST_SPECIAL_MASK}, + [midgard_op_ld_color_buffer_32u] = {"ld_color_buffer_32u", M32 | LDST_SPECIAL_MASK}, [midgard_op_ld_color_buffer_u8_as_fp16] = {"ld_color_buffer_u8_as_fp16", M16 | LDST_SPECIAL_MASK}, [midgard_op_ld_color_buffer_u8_as_fp16_old] = {"ld_color_buffer_u8_as_fp16_old", M16 | LDST_SPECIAL_MASK}, |