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

turnip: move descriptor set BO tracking to CmdBindDescriptorSets

Browse Source 
This avoids the duplicated code.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5446>
This commit is contained in:
Jonathan Marek
2020-06-14 10:17:28 -04:00
committed by Marge Bot
parent 5ef0f9f622
commit edb8c581db
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/freedreno/vulkan/tu_cmd_buffer.c
View File

@@ -1906,12 +1906,12 @@ tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
uint32_t dynamicOffsetCount, uint32_t dynamicOffsetCount,
const uint32_t *pDynamicOffsets) const uint32_t *pDynamicOffsets)
{ {
TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer);
TU_FROM_HANDLE(tu_pipeline_layout, layout, _layout); TU_FROM_HANDLE(tu_pipeline_layout, layout, _layout);
unsigned dyn_idx = 0; unsigned dyn_idx = 0;
struct tu_descriptor_state *descriptors_state = struct tu_descriptor_state *descriptors_state =
tu_get_descriptors_state(cmd_buffer, pipelineBindPoint); tu_get_descriptors_state(cmd, pipelineBindPoint);
for (unsigned i = 0; i < descriptorSetCount; ++i) { for (unsigned i = 0; i < descriptorSetCount; ++i) {
unsigned idx = i + firstSet; unsigned idx = i + firstSet;
@@ -1970,12 +1970,24 @@ tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
dst[5] = va >> 32; dst[5] = va >> 32;
} }
} }
for (unsigned j = 0; j < set->layout->buffer_count; ++j) {
if (set->buffers[j]) {
tu_bo_list_add(&cmd->bo_list, set->buffers[j],
MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE);
}
}
if (set->size > 0) {
tu_bo_list_add(&cmd->bo_list, &set->pool->bo,
MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_DUMP);
}
} }
if (pipelineBindPoint == VK_PIPELINE_BIND_POINT_COMPUTE) if (pipelineBindPoint == VK_PIPELINE_BIND_POINT_COMPUTE)
cmd_buffer->state.dirty |= TU_CMD_DIRTY_COMPUTE_DESCRIPTOR_SETS; cmd->state.dirty |= TU_CMD_DIRTY_COMPUTE_DESCRIPTOR_SETS;
else else
cmd_buffer->state.dirty |= TU_CMD_DIRTY_DESCRIPTOR_SETS; cmd->state.dirty |= TU_CMD_DIRTY_DESCRIPTOR_SETS;
} }
void tu_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, void tu_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer,
@@ -3477,22 +3489,6 @@ tu6_bind_draw_states(struct tu_cmd_buffer *cmd,
tu_cs_sanity_check(cs); tu_cs_sanity_check(cs);
/* track BOs */ /* track BOs */
if (cmd->state.dirty & TU_CMD_DIRTY_DESCRIPTOR_SETS) {
unsigned i;
for_each_bit(i, descriptors_state->valid) {
struct tu_descriptor_set *set = descriptors_state->sets[i];
for (unsigned j = 0; j < set->layout->buffer_count; ++j) {
if (set->buffers[j]) {
tu_bo_list_add(&cmd->bo_list, set->buffers[j],
MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE);
}
}
if (set->size > 0) {
tu_bo_list_add(&cmd->bo_list, &set->pool->bo,
MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_DUMP);
}
}
}
if (cmd->state.dirty & TU_CMD_DIRTY_STREAMOUT_BUFFERS) { if (cmd->state.dirty & TU_CMD_DIRTY_STREAMOUT_BUFFERS) {
for (unsigned i = 0; i < IR3_MAX_SO_BUFFERS; i++) { for (unsigned i = 0; i < IR3_MAX_SO_BUFFERS; i++) {
const struct tu_buffer *buf = cmd->state.streamout_buf.buffers[i]; const struct tu_buffer *buf = cmd->state.streamout_buf.buffers[i];
@@ -3842,23 +3838,6 @@ tu_dispatch(struct tu_cmd_buffer *cmd,
cmd->record_result = result; cmd->record_result = result;
return; return;
} }
/* track BOs */
unsigned i;
for_each_bit(i, descriptors_state->valid) {
struct tu_descriptor_set *set = descriptors_state->sets[i];
for (unsigned j = 0; j < set->layout->buffer_count; ++j) {
if (set->buffers[j]) {
tu_bo_list_add(&cmd->bo_list, set->buffers[j],
MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE);
}
}
if (set->size > 0) {
tu_bo_list_add(&cmd->bo_list, &set->pool->bo,
MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_DUMP);
}
}
} }
if (ib.size) if (ib.size)