fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 21:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/mdg: Drop the u8 from the colorbuf op names

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5265>
This commit is contained in:
Alyssa Rosenzweig 2020-05-29 21:08:32 -04:00 • committed by Marge Bot
parent 49840a8a58
commit 4f82aad7a2
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/panfrost/midgard/midgard.h
View file

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

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

@ -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;

4
src/panfrost/midgard/midgard_ops.c
View file

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