fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: pool descriptors per batch

Browse source 
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Erik Faye-Lund 2019-06-24 18:56:23 +02:00
parent 9913e5c40b
commit d9b7d7b051
6 changed files with 49 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/zink/zink_batch.c
View file

@ -13,6 +13,8 @@
static void
reset_batch(struct zink_screen *screen, struct zink_batch *batch)
{
batch->descs_left = ZINK_BATCH_DESC_SIZE;
// cmdbuf hasn't been submitted before
if (!batch->fence)
return;
@ -41,6 +43,9 @@ reset_batch(struct zink_screen *screen, struct zink_batch *batch)
vkDestroySampler(screen->dev, *samp, NULL);
}
util_dynarray_clear(&batch->zombie_samplers);
if (vkResetDescriptorPool(screen->dev, batch->descpool, 0) != VK_SUCCESS)
fprintf(stderr, "vkResetDescriptorPool failed\n");
}
void

4
src/gallium/drivers/zink/zink_batch.h
View file

@ -35,8 +35,12 @@ struct zink_render_pass;
struct zink_resource;
struct zink_sampler_view;
#define ZINK_BATCH_DESC_SIZE 1000
struct zink_batch {
VkCommandBuffer cmdbuf;
VkDescriptorPool descpool;
int descs_left;
struct zink_fence *fence;
struct zink_render_pass *rp;

70
src/gallium/drivers/zink/zink_context.c
View file

@ -801,38 +801,26 @@ zink_shader_stage(enum pipe_shader_type type)
}
static VkDescriptorSet
allocate_descriptor_set(struct zink_context *ctx, VkDescriptorSetLayout dsl)
allocate_descriptor_set(struct zink_screen *screen,
struct zink_batch *batch,
struct zink_gfx_program *prog)
{
struct zink_screen *screen = zink_screen(ctx->base.screen);
assert(batch->descs_left >= prog->num_descriptors);
VkDescriptorSetAllocateInfo dsai;
memset((void *)&dsai, 0, sizeof(dsai));
dsai.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
dsai.pNext = NULL;
dsai.descriptorPool = ctx->descpool;
dsai.descriptorPool = batch->descpool;
dsai.descriptorSetCount = 1;
dsai.pSetLayouts = &dsl;
dsai.pSetLayouts = &prog->dsl;
VkDescriptorSet desc_set;
if (vkAllocateDescriptorSets(screen->dev, &dsai, &desc_set) != VK_SUCCESS) {
/* if we run out of descriptor sets we either need to create a bunch
* more... or flush and wait. For simplicity, let's flush for now.
*/
struct pipe_fence_handle *fence = NULL;
ctx->base.flush(&ctx->base, &fence, 0);
ctx->base.screen->fence_finish(ctx->base.screen, &ctx->base, fence,
PIPE_TIMEOUT_INFINITE);
if (vkResetDescriptorPool(screen->dev, ctx->descpool, 0) != VK_SUCCESS) {
fprintf(stderr, "vkResetDescriptorPool failed\n");
return VK_NULL_HANDLE;
}
if (vkAllocateDescriptorSets(screen->dev, &dsai, &desc_set) != VK_SUCCESS) {
fprintf(stderr, "vkAllocateDescriptorSets failed\n");
return VK_NULL_HANDLE;
}
debug_printf("ZINK: failed to allocate descriptor set :/");
return VK_NULL_HANDLE;
}
batch->descs_left -= prog->num_descriptors;
return desc_set;
}
@ -1037,10 +1025,18 @@ zink_draw_vbo(struct pipe_context *pctx,
VK_IMAGE_LAYOUT_GENERAL);
}
VkDescriptorSet desc_set = allocate_descriptor_set(ctx, gfx_program->dsl);
batch = zink_batch_rp(ctx);
if (batch->descs_left < gfx_program->num_descriptors) {
flush_batch(ctx);
batch = zink_batch_rp(ctx);
assert(batch->descs_left >= gfx_program->num_descriptors);
}
VkDescriptorSet desc_set = allocate_descriptor_set(screen, batch,
gfx_program);
assert(desc_set != VK_NULL_HANDLE);
for (int i = 0; i < ARRAY_SIZE(ctx->gfx_stages); i++) {
struct zink_shader *shader = ctx->gfx_stages[i];
if (!shader)
@ -1392,6 +1388,17 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
cbai.commandPool = ctx->cmdpool;
cbai.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
cbai.commandBufferCount = 1;
VkDescriptorPoolSize sizes[] = {
{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, ZINK_BATCH_DESC_SIZE}
};
VkDescriptorPoolCreateInfo dpci = {};
dpci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
dpci.pPoolSizes = sizes;
dpci.poolSizeCount = ARRAY_SIZE(sizes);
dpci.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
dpci.maxSets = ZINK_BATCH_DESC_SIZE;
for (int i = 0; i < ARRAY_SIZE(ctx->batches); ++i) {
if (vkAllocateCommandBuffers(screen->dev, &cbai, &ctx->batches[i].cmdbuf) != VK_SUCCESS)
goto fail;
@ -1406,21 +1413,12 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
goto fail;
util_dynarray_init(&ctx->batches[i].zombie_samplers, NULL);
if (vkCreateDescriptorPool(screen->dev, &dpci, 0,
&ctx->batches[i].descpool) != VK_SUCCESS)
goto fail;
}
VkDescriptorPoolSize sizes[] = {
{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1000}
};
VkDescriptorPoolCreateInfo dpci = {};
dpci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
dpci.pPoolSizes = sizes;
dpci.poolSizeCount = ARRAY_SIZE(sizes);
dpci.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
dpci.maxSets = 1000;
if(vkCreateDescriptorPool(screen->dev, &dpci, 0, &ctx->descpool) != VK_SUCCESS)
goto fail;
vkGetDeviceQueue(screen->dev, screen->gfx_queue, 0, &ctx->queue);
ctx->program_cache = _mesa_hash_table_create(NULL,

2
src/gallium/drivers/zink/zink_context.h
View file

@ -68,8 +68,6 @@ struct zink_context {
VkQueue queue;
VkDescriptorPool descpool;
struct pipe_constant_buffer ubos[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT_BUFFERS];
struct pipe_framebuffer_state fb_state;

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

@ -35,7 +35,8 @@
static VkDescriptorSetLayout
create_desc_set_layout(VkDevice dev,
struct zink_shader *stages[PIPE_SHADER_TYPES - 1])
struct zink_shader *stages[PIPE_SHADER_TYPES - 1],
unsigned *num_descriptors)
{
VkDescriptorSetLayoutBinding bindings[PIPE_SHADER_TYPES * PIPE_MAX_CONSTANT_BUFFERS];
int num_bindings = 0;
@ -70,6 +71,7 @@ create_desc_set_layout(VkDevice dev,
return VK_NULL_HANDLE;
}
*num_descriptors = num_bindings;
return dsl;
}
@ -124,7 +126,8 @@ zink_create_gfx_program(struct zink_screen *screen,
for (int i = 0; i < PIPE_SHADER_TYPES - 1; ++i)
prog->stages[i] = stages[i];
prog->dsl = create_desc_set_layout(screen->dev, stages);
prog->dsl = create_desc_set_layout(screen->dev, stages,
&prog->num_descriptors);
if (!prog->dsl)
goto fail;

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

@ -39,6 +39,7 @@ struct zink_gfx_program {
struct zink_shader *stages[PIPE_SHADER_TYPES - 1]; // compute stage doesn't belong here
VkDescriptorSetLayout dsl;
VkPipelineLayout layout;
unsigned num_descriptors;
struct hash_table *pipelines[PIPE_PRIM_TRIANGLE_FAN + 1];
struct set *render_passes;
};