KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2020-01-02 12:28:54 -05:00
parent 5063ab6a9c
commit 2d1e18ee83
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/panfrost/midgard/midgard.h
View File

@ -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 */

4
src/panfrost/midgard/midgard_compile.c
View File

@ -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) {

2
src/panfrost/midgard/midgard_ops.c
View File

@ -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},