From 304005ff8130aa339954c18524f8b2dd29c5e4bd Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Tue, 29 Nov 2022 15:40:43 +0100 Subject: [PATCH] tu: Use right enum for compute active_shader_stages This is VkShaderStageFlags, not VkPipelineStageFlags. Fixes preloading descriptors for compute dispatches. Fixes: d862a2ebcbf ("turnip: Only emit descriptor loads for active stages in the pipeline.") Part-of: (cherry picked from commit 0a0a04bdaa6faf1dd3e937f7087ae1c4f240c916) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5ce1325..b8c1cfe 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -256,7 +256,7 @@ "description": "tu: Use right enum for compute active_shader_stages", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d862a2ebcbf94374e0ab0bd1c63bc45020a2ecef" }, diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index eb77042..214f96f 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -4994,7 +4994,7 @@ tu_compute_pipeline_create(VkDevice device, pipeline->executables_mem_ctx = ralloc_context(NULL); util_dynarray_init(&pipeline->executables, pipeline->executables_mem_ctx); - pipeline->active_stages = VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT; + pipeline->active_stages = VK_SHADER_STAGE_COMPUTE_BIT; struct tu_shader_key key = { }; tu_shader_key_init(&key, stage_info, dev); -- 2.7.4