Module: Mesa Branch: main Commit: 562e5ba28614aa44f1e60c2556a4f313c7b24153 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=562e5ba28614aa44f1e60c2556a4f313c7b24153
Author: Chia-I Wu <[email protected]> Date: Wed Jul 27 17:37:17 2022 -0700 turnip: remove shared_consts from tu_compiled_shaders It is set but unused. We also don't serialize/deserialize shared_consts to/from the pipeline cache. Fixes: e1f2cabc5e2 ("turnip: Change to use shared consts for PushConstants") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17777> --- src/freedreno/vulkan/tu_pipeline.c | 2 -- src/freedreno/vulkan/tu_private.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index b96ca44f7f0..7f0e8e793f0 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -2992,7 +2992,6 @@ tu_pipeline_builder_compile_shaders(struct tu_pipeline_builder *builder, stage_feedbacks[stage].duration += os_time_get_nano() - stage_start; } - compiled_shaders->shared_consts = pipeline->shared_consts; uint32_t safe_constlens = ir3_trim_constlen(compiled_shaders->variants, compiler); @@ -4163,7 +4162,6 @@ tu_compute_pipeline_create(VkDevice device, compiled->active_desc_sets = shader->active_desc_sets; compiled->push_consts[MESA_SHADER_COMPUTE] = shader->push_consts; - compiled->shared_consts = pipeline->shared_consts; struct ir3_shader_variant *v = ir3_shader_create_variant(shader->ir3_shader, &ir3_key, executable_info); diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 05ba4b248c4..1862f3aa338 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -1740,7 +1740,6 @@ struct tu_compiled_shaders { struct vk_pipeline_cache_object base; - struct tu_push_constant_range shared_consts; struct tu_push_constant_range push_consts[MESA_SHADER_STAGES]; uint8_t active_desc_sets; bool multi_pos_output;
