OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/cmd_buffer: Track descriptor set dirtying per-stage

Browse Source
This commit is contained in:
Jason Ekstrand
2015-05-30 10:07:29 -07:00
parent 33cccbbb73
commit 2251305e1a
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vulkan/device.c
View File

@@ -1754,6 +1754,7 @@ VkResult anv_CreateDescriptorSetLayout(
uint32_t surface_count[VK_NUM_SHADER_STAGE] = { 0, }; uint32_t surface_count[VK_NUM_SHADER_STAGE] = { 0, };
uint32_t num_dynamic_buffers = 0; uint32_t num_dynamic_buffers = 0;
uint32_t count = 0; uint32_t count = 0;
uint32_t stages = 0;
uint32_t s; uint32_t s;
for (uint32_t i = 0; i < pCreateInfo->count; i++) { for (uint32_t i = 0; i < pCreateInfo->count; i++) {
@@ -1793,6 +1794,7 @@ VkResult anv_CreateDescriptorSetLayout(
break; break;
} }
stages |= pCreateInfo->pBinding[i].stageFlags;
count += pCreateInfo->pBinding[i].count; count += pCreateInfo->pBinding[i].count;
} }
@@ -1812,6 +1814,7 @@ VkResult anv_CreateDescriptorSetLayout(
set_layout->num_dynamic_buffers = num_dynamic_buffers; set_layout->num_dynamic_buffers = num_dynamic_buffers;
set_layout->count = count; set_layout->count = count;
set_layout->shader_stages = stages;
struct anv_descriptor_slot *p = set_layout->entries; struct anv_descriptor_slot *p = set_layout->entries;
struct anv_descriptor_slot *sampler[VK_NUM_SHADER_STAGE]; struct anv_descriptor_slot *sampler[VK_NUM_SHADER_STAGE];
@@ -2409,6 +2412,7 @@ VkResult anv_CreateCommandBuffer(
cmd_buffer->dirty = 0; cmd_buffer->dirty = 0;
cmd_buffer->vb_dirty = 0; cmd_buffer->vb_dirty = 0;
cmd_buffer->descriptors_dirty = 0;
cmd_buffer->pipeline = NULL; cmd_buffer->pipeline = NULL;
cmd_buffer->vp_state = NULL; cmd_buffer->vp_state = NULL;
cmd_buffer->rs_state = NULL; cmd_buffer->rs_state = NULL;
@@ -2851,10 +2855,10 @@ void anv_CmdBindDescriptorSets(
pDynamicOffsets + dynamic_slot, pDynamicOffsets + dynamic_slot,
set_layout->num_dynamic_buffers * sizeof(*pDynamicOffsets)); set_layout->num_dynamic_buffers * sizeof(*pDynamicOffsets));
cmd_buffer->descriptors_dirty |= set_layout->shader_stages;
dynamic_slot += set_layout->num_dynamic_buffers; dynamic_slot += set_layout->num_dynamic_buffers;
} }
cmd_buffer->dirty |= ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY;
} }
void anv_CmdBindIndexBuffer( void anv_CmdBindIndexBuffer(
@@ -3078,8 +3082,11 @@ cmd_buffer_emit_samplers(struct anv_cmd_buffer *cmd_buffer, unsigned stage)
static void static void
flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer) flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
{ {
uint32_t s, dirty = cmd_buffer->descriptors_dirty &
cmd_buffer->pipeline->active_stages;
VkResult result; VkResult result;
for (uint32_t s = 0; s < VK_NUM_SHADER_STAGE; s++) { for_each_bit(s, dirty) {
result = cmd_buffer_emit_binding_table(cmd_buffer, s); result = cmd_buffer_emit_binding_table(cmd_buffer, s);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
break; break;
@@ -3095,7 +3102,8 @@ flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
result = anv_cmd_buffer_new_surface_state_bo(cmd_buffer); result = anv_cmd_buffer_new_surface_state_bo(cmd_buffer);
assert(result == VK_SUCCESS); assert(result == VK_SUCCESS);
for (uint32_t s = 0; s < VK_NUM_SHADER_STAGE; s++) { /* Re-emit all active binding tables */
for_each_bit(s, cmd_buffer->pipeline->active_stages) {
result = cmd_buffer_emit_binding_table(cmd_buffer, s); result = cmd_buffer_emit_binding_table(cmd_buffer, s);
result = cmd_buffer_emit_samplers(cmd_buffer, s); result = cmd_buffer_emit_samplers(cmd_buffer, s);
} }
@@ -3104,7 +3112,7 @@ flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
assert(result == VK_SUCCESS); assert(result == VK_SUCCESS);
} }
cmd_buffer->dirty &= ~ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY; cmd_buffer->descriptors_dirty &= ~cmd_buffer->pipeline->active_stages;
} }
static struct anv_state static struct anv_state
@@ -3172,7 +3180,7 @@ anv_cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer)
if (cmd_buffer->dirty & ANV_CMD_BUFFER_PIPELINE_DIRTY) if (cmd_buffer->dirty & ANV_CMD_BUFFER_PIPELINE_DIRTY)
anv_batch_emit_batch(&cmd_buffer->batch, &pipeline->batch); anv_batch_emit_batch(&cmd_buffer->batch, &pipeline->batch);
if (cmd_buffer->dirty & ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY) if (cmd_buffer->descriptors_dirty)
flush_descriptor_sets(cmd_buffer); flush_descriptor_sets(cmd_buffer);
if (cmd_buffer->dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY | ANV_CMD_BUFFER_RS_DIRTY)) { if (cmd_buffer->dirty & (ANV_CMD_BUFFER_PIPELINE_DIRTY | ANV_CMD_BUFFER_RS_DIRTY)) {
@@ -3782,7 +3790,7 @@ void anv_CmdBeginRenderPass(
cmd_buffer->framebuffer = framebuffer; cmd_buffer->framebuffer = framebuffer;
cmd_buffer->dirty |= ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY; cmd_buffer->descriptors_dirty |= VK_SHADER_STAGE_FRAGMENT_BIT;
anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_DRAWING_RECTANGLE, anv_batch_emit(&cmd_buffer->batch, GEN8_3DSTATE_DRAWING_RECTANGLE,
.ClippedDrawingRectangleYMin = pass->render_area.offset.y, .ClippedDrawingRectangleYMin = pass->render_area.offset.y,

4
src/vulkan/meta.c
View File

@@ -178,8 +178,8 @@ anv_cmd_buffer_restore(struct anv_cmd_buffer *cmd_buffer,
sizeof(state->old_vertex_bindings)); sizeof(state->old_vertex_bindings));
cmd_buffer->vb_dirty |= (1 << NUM_VB_USED) - 1; cmd_buffer->vb_dirty |= (1 << NUM_VB_USED) - 1;
cmd_buffer->dirty |= ANV_CMD_BUFFER_PIPELINE_DIRTY | cmd_buffer->dirty |= ANV_CMD_BUFFER_PIPELINE_DIRTY;
ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY; cmd_buffer->descriptors_dirty |= VK_SHADER_STAGE_VERTEX_BIT;
} }
struct vue_header { struct vue_header {

3
src/vulkan/private.h
View File

@@ -556,6 +556,7 @@ struct anv_descriptor_set_layout {
uint32_t count; uint32_t count;
uint32_t num_dynamic_buffers; uint32_t num_dynamic_buffers;
uint32_t shader_stages;
struct anv_descriptor_slot entries[0]; struct anv_descriptor_slot entries[0];
}; };
@@ -597,7 +598,6 @@ struct anv_buffer {
}; };
#define ANV_CMD_BUFFER_PIPELINE_DIRTY (1 << 0) #define ANV_CMD_BUFFER_PIPELINE_DIRTY (1 << 0)
#define ANV_CMD_BUFFER_DESCRIPTOR_SET_DIRTY (1 << 1)
#define ANV_CMD_BUFFER_RS_DIRTY (1 << 2) #define ANV_CMD_BUFFER_RS_DIRTY (1 << 2)
#define ANV_CMD_BUFFER_DS_DIRTY (1 << 3) #define ANV_CMD_BUFFER_DS_DIRTY (1 << 3)
#define ANV_CMD_BUFFER_CB_DIRTY (1 << 4) #define ANV_CMD_BUFFER_CB_DIRTY (1 << 4)
@@ -636,6 +636,7 @@ struct anv_cmd_buffer {
/* State required while building cmd buffer */ /* State required while building cmd buffer */
uint32_t vb_dirty; uint32_t vb_dirty;
uint32_t dirty; uint32_t dirty;
uint32_t descriptors_dirty;
struct anv_pipeline * pipeline; struct anv_pipeline * pipeline;
struct anv_framebuffer * framebuffer; struct anv_framebuffer * framebuffer;
struct anv_dynamic_rs_state * rs_state; struct anv_dynamic_rs_state * rs_state;