From 5ea32a6201983596fcabae04cb781d7d1f456636 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 12 Mar 2020 14:24:49 +0100 Subject: [PATCH] radv: remove radv_shader_variant::aco_used Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_pipeline.c | 2 +- src/amd/vulkan/radv_shader.c | 1 - src/amd/vulkan/radv_shader.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index f87333aefa5..d4b7f71d395 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -5653,7 +5653,7 @@ VkResult radv_GetPipelineExecutableInternalRepresentationsKHR( /* backend IR */ if (p < end) { p->isText = true; - if (shader->aco_used) { + if (pipeline->device->physical_device->use_aco) { desc_copy(p->name, "ACO IR"); desc_copy(p->description, "The ACO IR after some optimizations"); } else { diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 0feb9764b8a..6be0c43a7ab 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -1160,7 +1160,6 @@ shader_variant_compile(struct radv_device *device, free(binary); return NULL; } - variant->aco_used = device->physical_device->use_aco; if (options->dump_shader) { fprintf(stderr, "disasm:\n%s\n", variant->disasm_string); diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index f08742f9cd5..4e4ba73dced 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -372,7 +372,6 @@ struct radv_shader_variant { struct radv_shader_info info; /* debug only */ - bool aco_used; char *spirv; uint32_t spirv_size; char *nir_string; -- 2.30.2