Module: Mesa Branch: main Commit: e132af91923087c74abdb4e68bc329eb9abfbb82 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e132af91923087c74abdb4e68bc329eb9abfbb82
Author: Mike Blumenkrantz <[email protected]> Date: Mon Feb 6 13:32:26 2023 -0500 zink: move bindless_layout to screen and init on creation this is more consistent with the actual usage Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21169> --- src/gallium/drivers/zink/zink_batch.c | 2 +- src/gallium/drivers/zink/zink_descriptors.c | 75 +++++------------------------ src/gallium/drivers/zink/zink_descriptors.h | 15 ++++++ src/gallium/drivers/zink/zink_screen.c | 52 +++++++++++++++++++- src/gallium/drivers/zink/zink_types.h | 3 +- 5 files changed, 80 insertions(+), 67 deletions(-) diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index 841c2d9a894..fb16a990628 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -421,7 +421,7 @@ zink_batch_bind_db(struct zink_context *ctx) infos[i].usage = batch->state->dd.db[i]->obj->vkusage; assert(infos[i].usage); } - if (ctx->dd.bindless_layout) { + if (ctx->dd.bindless_init) { infos[ZINK_DESCRIPTOR_BINDLESS].sType = VK_STRUCTURE_TYPE_DESCRIPTOR_BUFFER_BINDING_INFO_EXT; infos[ZINK_DESCRIPTOR_BINDLESS].address = ctx->dd.db.bindless_db->obj->bda; infos[ZINK_DESCRIPTOR_BINDLESS].usage = ctx->dd.db.bindless_db->obj->vkusage; diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 7327ff61426..2e270de87c2 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -606,7 +606,7 @@ zink_descriptor_program_init(struct zink_context *ctx, struct zink_program *pg) if (pg->dd.bindless) { unsigned desc_set = screen->desc_set_id[ZINK_DESCRIPTOR_BINDLESS]; pg->num_dsl = desc_set + 1; - pg->dsl[desc_set] = ctx->dd.bindless_layout; + pg->dsl[desc_set] = screen->bindless_layout; /* separate handling for null set injection when only bindless descriptors are used */ for (unsigned i = 0; i < desc_set; i++) { if (!pg->dsl[i]) { @@ -649,7 +649,7 @@ zink_descriptor_program_init(struct zink_context *ctx, struct zink_program *pg) bool is_push = i == 0; /* no need for empty templates */ if (pg->dsl[i] == ctx->dd.dummy_dsl->layout || - pg->dsl[i] == ctx->dd.bindless_layout || + pg->dsl[i] == screen->bindless_layout || (!is_push && pg->dd.templates[i])) continue; template[i].sType = VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO; @@ -1477,83 +1477,33 @@ zink_descriptor_util_init_fbfetch(struct zink_context *ctx) } } -/* bindless descriptor bindings have their own struct indexing */ -ALWAYS_INLINE static VkDescriptorType -type_from_bindless_index(unsigned idx) -{ - switch (idx) { - case 0: return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; - case 1: return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - case 2: return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - case 3: return VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - default: - unreachable("unknown index"); - } -} - /* called when a shader that uses bindless is created */ void zink_descriptors_init_bindless(struct zink_context *ctx) { - if (ctx->dd.bindless_layout) + if (ctx->dd.bindless_init) return; - struct zink_screen *screen = zink_screen(ctx->base.screen); - VkDescriptorSetLayoutBinding bindings[4]; - const unsigned num_bindings = 4; - VkDescriptorSetLayoutCreateInfo dcslci = {0}; - dcslci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; - dcslci.pNext = NULL; - VkDescriptorSetLayoutBindingFlagsCreateInfo fci = {0}; - VkDescriptorBindingFlags flags[4]; - dcslci.pNext = &fci; - if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) - dcslci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT; - else - dcslci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; - fci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO; - fci.bindingCount = num_bindings; - fci.pBindingFlags = flags; - for (unsigned i = 0; i < num_bindings; i++) { - flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT | VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; - if (zink_descriptor_mode != ZINK_DESCRIPTOR_MODE_DB) - flags[i] |= VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT; - } - /* there is exactly 1 bindless descriptor set per context, and it has 4 bindings, 1 for each descriptor type */ - for (unsigned i = 0; i < num_bindings; i++) { - bindings[i].binding = i; - bindings[i].descriptorType = type_from_bindless_index(i); - bindings[i].descriptorCount = ZINK_MAX_BINDLESS_HANDLES; - bindings[i].stageFlags = VK_SHADER_STAGE_ALL_GRAPHICS | VK_SHADER_STAGE_COMPUTE_BIT; - bindings[i].pImmutableSamplers = NULL; - } - - dcslci.bindingCount = num_bindings; - dcslci.pBindings = bindings; - VkResult result = VKSCR(CreateDescriptorSetLayout)(screen->dev, &dcslci, 0, &ctx->dd.bindless_layout); - if (result != VK_SUCCESS) { - mesa_loge("ZINK: vkCreateDescriptorSetLayout failed (%s)", vk_Result_to_str(result)); - return; - } + assert(screen->bindless_layout); if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) { unsigned bind = ZINK_BIND_RESOURCE_DESCRIPTOR | ZINK_BIND_SAMPLER_DESCRIPTOR; VkDeviceSize size; - VKSCR(GetDescriptorSetLayoutSizeEXT)(screen->dev, ctx->dd.bindless_layout, &size); + VKSCR(GetDescriptorSetLayoutSizeEXT)(screen->dev, screen->bindless_layout, &size); struct pipe_resource *pres = pipe_buffer_create(&screen->base, bind, 0, size); ctx->dd.db.bindless_db = zink_resource(pres); ctx->dd.db.bindless_db_map = pipe_buffer_map(&ctx->base, pres, PIPE_MAP_READ | PIPE_MAP_WRITE, &ctx->dd.db.bindless_db_xfer); zink_batch_bind_db(ctx); - for (unsigned i = 0; i < num_bindings; i++) { + for (unsigned i = 0; i < 4; i++) { VkDeviceSize offset; - VKSCR(GetDescriptorSetLayoutBindingOffsetEXT)(screen->dev, ctx->dd.bindless_layout, i, &offset); + VKSCR(GetDescriptorSetLayoutBindingOffsetEXT)(screen->dev, screen->bindless_layout, i, &offset); ctx->dd.db.db_offsets[i] = offset; } } else { VkDescriptorPoolCreateInfo dpci = {0}; VkDescriptorPoolSize sizes[4]; for (unsigned i = 0; i < 4; i++) { - sizes[i].type = type_from_bindless_index(i); + sizes[i].type = zink_descriptor_type_from_bindless_index(i); sizes[i].descriptorCount = ZINK_MAX_BINDLESS_HANDLES; } dpci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; @@ -1561,14 +1511,15 @@ zink_descriptors_init_bindless(struct zink_context *ctx) dpci.poolSizeCount = 4; dpci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT; dpci.maxSets = 1; - result = VKSCR(CreateDescriptorPool)(screen->dev, &dpci, 0, &ctx->dd.t.bindless_pool); + VkResult result = VKSCR(CreateDescriptorPool)(screen->dev, &dpci, 0, &ctx->dd.t.bindless_pool); if (result != VK_SUCCESS) { mesa_loge("ZINK: vkCreateDescriptorPool failed (%s)", vk_Result_to_str(result)); return; } - zink_descriptor_util_alloc_sets(screen, ctx->dd.bindless_layout, ctx->dd.t.bindless_pool, &ctx->dd.t.bindless_set, 1); + zink_descriptor_util_alloc_sets(screen, screen->bindless_layout, ctx->dd.t.bindless_pool, &ctx->dd.t.bindless_set, 1); } + ctx->dd.bindless_init = true; } /* called on context destroy */ @@ -1576,8 +1527,6 @@ void zink_descriptors_deinit_bindless(struct zink_context *ctx) { struct zink_screen *screen = zink_screen(ctx->base.screen); - if (ctx->dd.bindless_layout) - VKSCR(DestroyDescriptorSetLayout)(screen->dev, ctx->dd.bindless_layout, NULL); if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) { if (ctx->dd.db.bindless_db_xfer) pipe_buffer_unmap(&ctx->base, ctx->dd.db.bindless_db_xfer); @@ -1646,7 +1595,7 @@ zink_descriptors_update_bindless(struct zink_context *ctx) /* buffer handle ids are offset by ZINK_MAX_BINDLESS_HANDLES for internal tracking */ wd.dstArrayElement = is_buffer ? handle - ZINK_MAX_BINDLESS_HANDLES : handle; wd.descriptorCount = 1; - wd.descriptorType = type_from_bindless_index(wd.dstBinding); + wd.descriptorType = zink_descriptor_type_from_bindless_index(wd.dstBinding); if (is_buffer) wd.pTexelBufferView = &ctx->di.bindless[i].t.buffer_infos[wd.dstArrayElement]; else diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h index 510749e02b9..c3705b693a7 100644 --- a/src/gallium/drivers/zink/zink_descriptors.h +++ b/src/gallium/drivers/zink/zink_descriptors.h @@ -118,6 +118,21 @@ zink_descriptor_type_to_size_idx_comp(enum zink_descriptor_type type) } unreachable("unknown type"); } + +/* bindless descriptor bindings have their own struct indexing */ +ALWAYS_INLINE static VkDescriptorType +zink_descriptor_type_from_bindless_index(unsigned idx) +{ + switch (idx) { + case 0: return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; + case 1: return VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + case 2: return VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + case 3: return VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + default: + unreachable("unknown index"); + } +} + bool zink_descriptor_layouts_init(struct zink_screen *screen); diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 0a7a12b47aa..3f24be319ce 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1446,6 +1446,8 @@ zink_destroy_screen(struct pipe_screen *pscreen) simple_mtx_destroy(&screen->semaphores_lock); while (util_dynarray_contains(&screen->semaphores, VkSemaphore)) VKSCR(DestroySemaphore)(screen->dev, util_dynarray_pop(&screen->semaphores, VkSemaphore), NULL); + if (screen->bindless_layout) + VKSCR(DestroyDescriptorSetLayout)(screen->dev, screen->bindless_layout, NULL); simple_mtx_destroy(&screen->queue_lock); VKSCR(DestroyDevice)(screen->dev, NULL); @@ -2551,6 +2553,52 @@ zink_create_semaphore(struct zink_screen *screen) return ret == VK_SUCCESS ? sem : VK_NULL_HANDLE; } +static bool +init_layouts(struct zink_screen *screen) +{ + if (screen->info.have_EXT_descriptor_indexing) { + VkDescriptorSetLayoutBinding bindings[4]; + const unsigned num_bindings = 4; + VkDescriptorSetLayoutCreateInfo dcslci = {0}; + dcslci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + dcslci.pNext = NULL; + VkDescriptorSetLayoutBindingFlagsCreateInfo fci = {0}; + VkDescriptorBindingFlags flags[4]; + dcslci.pNext = &fci; + if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) + dcslci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT; + else + dcslci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; + fci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO; + fci.bindingCount = num_bindings; + fci.pBindingFlags = flags; + for (unsigned i = 0; i < num_bindings; i++) { + flags[i] = VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT | VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; + if (zink_descriptor_mode != ZINK_DESCRIPTOR_MODE_DB) + flags[i] |= VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT; + } + /* there is exactly 1 bindless descriptor set per context, and it has 4 bindings, 1 for each descriptor type */ + for (unsigned i = 0; i < num_bindings; i++) { + bindings[i].binding = i; + bindings[i].descriptorType = zink_descriptor_type_from_bindless_index(i); + bindings[i].descriptorCount = ZINK_MAX_BINDLESS_HANDLES; + bindings[i].stageFlags = VK_SHADER_STAGE_ALL_GRAPHICS | VK_SHADER_STAGE_COMPUTE_BIT; + bindings[i].pImmutableSamplers = NULL; + } + + dcslci.bindingCount = num_bindings; + dcslci.pBindings = bindings; + VkResult result = VKSCR(CreateDescriptorSetLayout)(screen->dev, &dcslci, 0, &screen->bindless_layout); + if (result != VK_SUCCESS) { + mesa_loge("ZINK: vkCreateDescriptorSetLayout failed (%s)", vk_Result_to_str(result)); + return false; + } + } + + screen->gfx_push_constant_layout = zink_pipeline_layout_create(screen, NULL, 0, false); + return !!screen->gfx_push_constant_layout; +} + static struct zink_screen * zink_internal_create_screen(const struct pipe_screen_config *config) { @@ -2882,8 +2930,8 @@ zink_internal_create_screen(const struct pipe_screen_config *config) screen->buffer_barrier = zink_resource_buffer_barrier; } - screen->gfx_push_constant_layout = zink_pipeline_layout_create(screen, NULL, 0, false); - if (screen->gfx_push_constant_layout == VK_NULL_HANDLE) + + if (!init_layouts(screen)) goto fail; if (!zink_descriptor_layouts_init(screen)) diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index d5c1700a0a7..f5badd5630c 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -386,6 +386,7 @@ struct zink_descriptor_template { /* ctx->dd; created at context creation */ struct zink_descriptor_data { bool bindless_bound; + bool bindless_init; bool has_fbfetch; bool push_state_changed[2]; //gfx, compute uint8_t state_changed[2]; //gfx, compute @@ -395,7 +396,6 @@ struct zink_descriptor_data { struct zink_descriptor_layout *dummy_dsl; - VkDescriptorSetLayout bindless_layout; union { struct { VkDescriptorPool bindless_pool; @@ -1269,6 +1269,7 @@ struct zink_screen { struct util_live_shader_cache shaders; uint64_t db_size[ZINK_DESCRIPTOR_ALL_TYPES]; + VkDescriptorSetLayout bindless_layout; struct { struct pb_cache bo_cache;
