From b25d8850f09a469c84a0321a8e11a039810774c0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 4 Aug 2022 11:21:15 -0400 Subject: [PATCH] zink: remove descriptor dummy_set while well-intentioned, this didn't actually do anything Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_descriptors.c | 7 ++----- src/gallium/drivers/zink/zink_types.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 66aca5a2fde..b67324a09b2 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -819,11 +819,8 @@ zink_descriptors_update_lazy(struct zink_context *ctx, bool is_compute) if (need_push && !have_KHR_push_descriptor) { struct zink_descriptor_pool *pool = check_push_pool_alloc(ctx, bdd->push_pool[pg->is_compute], bdd, pg->is_compute); push_set = get_descriptor_set_lazy(pool); - if (!push_set) { - mesa_loge("ZINK: failed to get push descriptor set!"); - /* just jam something in to avoid a hang */ - push_set = ctx->dd->dummy_set; - } + if (!push_set) + mesa_loge("ZINK: failed to get push descriptor set! prepare to crash!"); } /* * when binding a pipeline, the pipeline can correctly access any previously bound diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index 1af5b80c6f1..e6240866698 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -311,7 +311,6 @@ struct zink_descriptor_data { VkDescriptorUpdateTemplate push_template[2]; //gfx, compute struct zink_descriptor_layout *dummy_dsl; - VkDescriptorSet dummy_set; VkDescriptorSetLayout bindless_layout; VkDescriptorPool bindless_pool;