From 9f171385711afe1b23a647abdf721518ddcb6ba0 Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Mon, 16 Dec 2024 16:32:11 -0800 Subject: [PATCH] panvk: remove load_multisampled_pan sysval This was only used by bi_lower_sample_mask_writes, which now ignores it in panvk due to panfrost_compile_inputs::single_sample_full_coverage. Signed-off-by: Benjamin Lee Reviewed-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c | 6 ------ src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c | 3 --- src/panfrost/vulkan/panvk_shader.h | 4 ---- src/panfrost/vulkan/panvk_vX_shader.c | 4 ---- 4 files changed, 17 deletions(-) diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c index f99c85be9e1..cea1285ffc6 100644 --- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c @@ -230,14 +230,8 @@ prepare_sysvals(struct panvk_cmd_buffer *cmdbuf, struct vk_color_blend_state *cb = &cmdbuf->vk.dynamic_graphics_state.cb; const struct vk_rasterization_state *rs = &cmdbuf->vk.dynamic_graphics_state.rs; - struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.render.fb.info; const struct panvk_shader *fs = cmdbuf->state.gfx.fs.shader; - if (gfx_state_dirty(cmdbuf, RENDER_STATE)) { - sysvals->fs.multisampled = fbinfo->nr_samples > 1; - gfx_state_set_dirty(cmdbuf, PUSH_UNIFORMS); - } - uint32_t noperspective_varyings = fs ? fs->info.varyings.noperspective : 0; if (sysvals->vs.noperspective_varyings != noperspective_varyings) { sysvals->vs.noperspective_varyings = noperspective_varyings; diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c index a0fa2a37956..c2acfe189b1 100644 --- a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c @@ -96,7 +96,6 @@ panvk_cmd_prepare_draw_sysvals(struct panvk_cmd_buffer *cmdbuf, struct panvk_shader_desc_state *fs_desc_state = &cmdbuf->state.gfx.fs.desc; struct panvk_graphics_sysvals *sysvals = &cmdbuf->state.gfx.sysvals; struct vk_color_blend_state *cb = &cmdbuf->vk.dynamic_graphics_state.cb; - struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.render.fb.info; unsigned base_vertex = draw->index_size ? draw->vertex_offset : 0; uint32_t noperspective_varyings = fs ? fs->info.varyings.noperspective : 0; @@ -104,14 +103,12 @@ panvk_cmd_prepare_draw_sysvals(struct panvk_cmd_buffer *cmdbuf, sysvals->vs.base_vertex != base_vertex || sysvals->vs.base_instance != draw->first_instance || sysvals->layer_id != draw->layer_id || - sysvals->fs.multisampled != (fbinfo->nr_samples > 1) || sysvals->vs.noperspective_varyings != noperspective_varyings) { sysvals->vs.first_vertex = draw->offset_start; sysvals->vs.base_vertex = base_vertex; sysvals->vs.base_instance = draw->first_instance; sysvals->vs.noperspective_varyings = noperspective_varyings; sysvals->layer_id = draw->layer_id; - sysvals->fs.multisampled = fbinfo->nr_samples > 1; gfx_state_set_dirty(cmdbuf, PUSH_UNIFORMS); } diff --git a/src/panfrost/vulkan/panvk_shader.h b/src/panfrost/vulkan/panvk_shader.h index c66cb060674..eff0799f4ea 100644 --- a/src/panfrost/vulkan/panvk_shader.h +++ b/src/panfrost/vulkan/panvk_shader.h @@ -57,10 +57,6 @@ struct panvk_graphics_sysvals { uint32_t noperspective_varyings; } vs; - struct { - uint32_t multisampled; - } fs; - #if PAN_ARCH <= 7 /* gl_Layer on Bifrost is a bit of hack. We have to issue one draw per * layer, and filter primitives at the VS level. diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index b5e61885352..ac5e343d45e 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -116,10 +116,6 @@ panvk_lower_sysvals(nir_builder *b, nir_instr *instr, void *data) val = load_sysval_from_push_const(b, SYSVAL(graphics, blend.constants), bit_size, num_comps); break; - case nir_intrinsic_load_multisampled_pan: - val = load_sysval_from_push_const(b, SYSVAL(graphics, fs.multisampled), - bit_size, num_comps); - break; case nir_intrinsic_load_noperspective_varyings_pan: /* TODO: use a VS epilog specialized on constant noperspective_varyings * with VK_EXT_graphics_pipeline_libraries and VK_EXT_shader_object */