From 2ccdae24cfaeb17e1e2f5d9b02157a26c126d03e Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 1 Sep 2025 14:11:09 +0200 Subject: [PATCH] radv: remove set but unused radv_graphics_pipeline fields Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_pipeline_graphics.c | 18 ------------------ src/amd/vulkan/radv_pipeline_graphics.h | 10 ---------- 2 files changed, 28 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index e194d0fee68..20a0110fe88 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -3345,22 +3345,6 @@ radv_pipeline_init_shader_stages_state(const struct radv_device *device, struct } } } - - mesa_shader_stage first_stage = - radv_pipeline_has_stage(pipeline, MESA_SHADER_MESH) ? MESA_SHADER_MESH : MESA_SHADER_VERTEX; - - const struct radv_shader *shader = radv_get_shader(pipeline->base.shaders, first_stage); - const struct radv_userdata_info *loc = radv_get_user_sgpr_info(shader, AC_UD_VS_BASE_VERTEX_START_INSTANCE); - - if (loc->sgpr_idx != -1) { - pipeline->vtx_base_sgpr = shader->info.user_data_0; - pipeline->vtx_base_sgpr += loc->sgpr_idx * 4; - pipeline->vtx_emit_num = loc->num_sgprs; - pipeline->uses_drawid = radv_get_shader(pipeline->base.shaders, first_stage)->info.vs.needs_draw_id; - pipeline->uses_baseinstance = radv_get_shader(pipeline->base.shaders, first_stage)->info.vs.needs_base_instance; - - assert(first_stage != MESA_SHADER_MESH || !pipeline->uses_baseinstance); - } } uint32_t @@ -3543,8 +3527,6 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv radv_pipeline_init_shader_stages_state(device, pipeline); pipeline->is_ngg = pipeline->base.shaders[pipeline->last_vgt_api_stage]->info.is_ngg; - pipeline->has_ngg_culling = pipeline->base.shaders[pipeline->last_vgt_api_stage]->info.has_ngg_culling; - pipeline->force_vrs_per_vertex = pipeline->base.shaders[pipeline->last_vgt_api_stage]->info.force_vrs_per_vertex; pipeline->vgt_outprim_type = vgt_outprim_type; pipeline->uses_out_of_order_rast = gfx_state.vk.rs->rasterization_order_amd == VK_RASTERIZATION_ORDER_RELAXED_AMD; pipeline->uses_vrs = radv_is_vrs_enabled(&gfx_state.vk); diff --git a/src/amd/vulkan/radv_pipeline_graphics.h b/src/amd/vulkan/radv_pipeline_graphics.h index 5685e2a4373..16aaf9539db 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.h +++ b/src/amd/vulkan/radv_pipeline_graphics.h @@ -132,19 +132,9 @@ struct radv_sqtt_shaders_reloc { struct radv_graphics_pipeline { struct radv_pipeline base; - bool uses_drawid; - bool uses_baseinstance; - - /* Whether the pipeline forces per-vertex VRS (GFX10.3+). */ - bool force_vrs_per_vertex; - /* Whether the pipeline uses NGG (GFX10+). */ bool is_ngg; - bool has_ngg_culling; - uint8_t vtx_emit_num; - - uint32_t vtx_base_sgpr; uint64_t dynamic_states; uint64_t needed_dynamic_state;