From 0411bb12978e762284397e668885ddd65aee15c8 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 6 Apr 2022 12:54:37 +0200 Subject: [PATCH] radv: drop the module reference in radv_can_dump_shader_stats() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Timur Kristóf Part-of: --- src/amd/vulkan/radv_pipeline.c | 6 +++--- src/amd/vulkan/radv_shader.c | 5 ++--- src/amd/vulkan/radv_shader.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index ddfcbc3..f1761ea 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -4539,11 +4539,11 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) { free(binaries[i]); if (nir[i]) { - ralloc_free(nir[i]); - - if (radv_can_dump_shader_stats(device, modules[i])) { + if (radv_can_dump_shader_stats(device, nir[i]) && pipeline->shaders[i]) { radv_dump_shader_stats(device, pipeline, i, stderr); } + + ralloc_free(nir[i]); } } diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 95a82c7..6051163 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -136,11 +136,10 @@ radv_can_dump_shader(struct radv_device *device, nir_shader *nir, bool meta_shad } bool -radv_can_dump_shader_stats(struct radv_device *device, struct vk_shader_module *module) +radv_can_dump_shader_stats(struct radv_device *device, nir_shader *nir) { /* Only dump non-meta shader stats. */ - return device->instance->debug_flags & RADV_DEBUG_DUMP_SHADER_STATS && module && - !is_meta_shader(module->nir); + return device->instance->debug_flags & RADV_DEBUG_DUMP_SHADER_STATS && !is_meta_shader(nir); } void diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 52b4cf9..d7f4668 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -581,7 +581,7 @@ unsigned radv_compute_spi_ps_input(const struct radv_device *device, bool radv_can_dump_shader(struct radv_device *device, nir_shader *nir, bool meta_shader); -bool radv_can_dump_shader_stats(struct radv_device *device, struct vk_shader_module *module); +bool radv_can_dump_shader_stats(struct radv_device *device, nir_shader *nir); VkResult radv_dump_shader_stats(struct radv_device *device, struct radv_pipeline *pipeline, gl_shader_stage stage, FILE *output); -- 2.7.4