From 302900038909a509da44d116d0609bb48012595b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 31 Jan 2022 12:26:52 -0500 Subject: [PATCH] zink: remove zink_descriptor_util_init_null_set() no longer used Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_descriptors.c | 22 ---------------------- src/gallium/drivers/zink/zink_descriptors.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 3d1aa4b..0440374 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -554,28 +554,6 @@ zink_descriptor_util_push_layouts_get(struct zink_context *ctx, struct zink_desc return dsls[0] && dsls[1]; } -void -zink_descriptor_util_init_null_set(struct zink_context *ctx, VkDescriptorSet desc_set) -{ - struct zink_screen *screen = zink_screen(ctx->base.screen); - VkDescriptorBufferInfo push_info; - VkWriteDescriptorSet push_wd; - push_wd.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - push_wd.pNext = NULL; - push_wd.dstBinding = 0; - push_wd.dstArrayElement = 0; - push_wd.descriptorCount = 1; - push_wd.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; - push_wd.dstSet = desc_set; - push_wd.pBufferInfo = &push_info; - push_info.buffer = screen->info.rb2_feats.nullDescriptor ? - VK_NULL_HANDLE : - zink_resource(ctx->dummy_vertex_buffer)->obj->buffer; - push_info.offset = 0; - push_info.range = VK_WHOLE_SIZE; - VKSCR(UpdateDescriptorSets)(screen->dev, 1, &push_wd, 0, NULL); -} - VkImageLayout zink_descriptor_util_image_layout_eval(const struct zink_resource *res, bool is_compute) { diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h index e09c75f..5e56e87 100644 --- a/src/gallium/drivers/zink/zink_descriptors.h +++ b/src/gallium/drivers/zink/zink_descriptors.h @@ -216,8 +216,6 @@ void zink_descriptor_util_init_fbfetch(struct zink_context *ctx); bool zink_descriptor_util_push_layouts_get(struct zink_context *ctx, struct zink_descriptor_layout **dsls, struct zink_descriptor_layout_key **layout_keys); -void -zink_descriptor_util_init_null_set(struct zink_context *ctx, VkDescriptorSet desc_set); VkImageLayout zink_descriptor_util_image_layout_eval(const struct zink_resource *res, bool is_compute); void -- 2.7.4