diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 0224bbb9e10..8792bb2ab10 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -411,7 +411,7 @@ panfrost_emit_blend(struct panfrost_batch *batch, void *rts, pan_fixup_blend_type)(fs->info.bifrost.blend[i].type, format); } else { cfg.fixed_function.conversion.register_format = - fs->info.bifrost.blend[i].format; + pan_blend_type_from_nir(fs->info.bifrost.blend[i].type); } #endif } diff --git a/src/panfrost/compiler/pan_compiler.h b/src/panfrost/compiler/pan_compiler.h index 352eb513335..e29c9158474 100644 --- a/src/panfrost/compiler/pan_compiler.h +++ b/src/panfrost/compiler/pan_compiler.h @@ -179,9 +179,6 @@ pan_get_fixed_varying_mask(unsigned varyings_used) struct bifrost_shader_blend_info { nir_alu_type type; uint32_t return_offset; - - /* mali_bifrost_register_file_format corresponding to nir_alu_type */ - unsigned format; }; /* diff --git a/src/panfrost/lib/pan_shader.c b/src/panfrost/lib/pan_shader.c index f409006d88c..a9ad7ac3ec1 100644 --- a/src/panfrost/lib/pan_shader.c +++ b/src/panfrost/lib/pan_shader.c @@ -170,12 +170,4 @@ pan_shader_compile(nir_shader *s, struct pan_compile_inputs *inputs, info->ftz_fp32 = true; } } - - if (arch >= 6) { - /* This is "redundant" information, but is needed in a draw-time hot path */ - for (unsigned i = 0; i < ARRAY_SIZE(info->bifrost.blend); ++i) { - info->bifrost.blend[i].format = - pan_blend_type_from_nir(info->bifrost.blend[i].type); - } - } } diff --git a/src/panfrost/vulkan/panvk_vX_blend.c b/src/panfrost/vulkan/panvk_vX_blend.c index 56c47883416..859421eafc8 100644 --- a/src/panfrost/vulkan/panvk_vX_blend.c +++ b/src/panfrost/vulkan/panvk_vX_blend.c @@ -196,14 +196,13 @@ emit_blend_desc(const struct pan_shader_info *fs_info, uint64_t fs_code, cfg.internal.fixed_function.rt = rt_idx; #if PAN_ARCH < 9 + nir_alu_type type = fs_info->bifrost.blend[blend_idx].type; if (fs_info->fs.untyped_color_outputs) { - nir_alu_type type = fs_info->bifrost.blend[blend_idx].type; - cfg.internal.fixed_function.conversion.register_format = GENX(pan_fixup_blend_type)(type, rt->format); } else { cfg.internal.fixed_function.conversion.register_format = - fs_info->bifrost.blend[blend_idx].format; + pan_blend_type_from_nir(type); } if (!opaque) {