fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: remove descriptor dummy_set

Browse source 
while well-intentioned, this didn't actually do anything

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18051>
This commit is contained in:
Mike Blumenkrantz 2022-08-04 11:21:15 -04:00
parent 8c8fb47f6b
commit b25d8850f0
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/zink/zink_descriptors.c
View file

@ -819,11 +819,8 @@ zink_descriptors_update_lazy(struct zink_context *ctx, bool is_compute)
if (need_push && !have_KHR_push_descriptor) { 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); 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); push_set = get_descriptor_set_lazy(pool);
if (!push_set) { if (!push_set)
mesa_loge("ZINK: failed to get push descriptor set!"); mesa_loge("ZINK: failed to get push descriptor set! prepare to crash!");
/* just jam something in to avoid a hang */
push_set = ctx->dd->dummy_set;
}
} }
/* /*
* when binding a pipeline, the pipeline can correctly access any previously bound * when binding a pipeline, the pipeline can correctly access any previously bound

1
src/gallium/drivers/zink/zink_types.h
View file

@ -311,7 +311,6 @@ struct zink_descriptor_data {
VkDescriptorUpdateTemplate push_template[2]; //gfx, compute VkDescriptorUpdateTemplate push_template[2]; //gfx, compute
struct zink_descriptor_layout *dummy_dsl; struct zink_descriptor_layout *dummy_dsl;
VkDescriptorSet dummy_set;
VkDescriptorSetLayout bindless_layout; VkDescriptorSetLayout bindless_layout;
VkDescriptorPool bindless_pool; VkDescriptorPool bindless_pool;