KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3dv: only save/restore push constant data for meta operations if needed 

If the command buffer didn't have any push constants or the meta
operation didn't write any new constants we don't need to restore
the state.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17536>
This commit is contained in:
Iago Toral Quiroga 2022-07-13 11:29:02 +02:00 committed by Marge Bot
parent 669daa37b1
commit 41a0c89d9f
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/broadcom/vulkan/v3dv_cmd_buffer.c
View File

@ -2231,12 +2231,12 @@ v3dv_cmd_buffer_meta_state_push(struct v3dv_cmd_buffer *cmd_buffer,
state->meta.has_descriptor_state = false;
}
/* FIXME: if we keep track of wether we have bound any push constant state
* at all we could restruct this only to cases where it is actually
* necessary.
*/
memcpy(state->meta.push_constants, cmd_buffer->push_constants_data,
sizeof(state->meta.push_constants));
if (cmd_buffer->push_constants_size > 0) {
state->meta.push_constants_size = cmd_buffer->push_constants_size;
memcpy(state->meta.push_constants, cmd_buffer->push_constants_data,
cmd_buffer->push_constants_size);
cmd_buffer->push_constants_size = 0;
}
}
/* This restores command buffer state after a meta operation
@ -2299,14 +2299,23 @@ v3dv_cmd_buffer_meta_state_pop(struct v3dv_cmd_buffer *cmd_buffer,
}
}
memcpy(cmd_buffer->push_constants_data, state->meta.push_constants,
sizeof(state->meta.push_constants));
/* We only need to restore push constant data if we had any data in the
* original command buffer and the meta operation wrote new push constant
* data.
*/
if (state->meta.push_constants_size > 0 &&
cmd_buffer->push_constants_size > 0) {
memcpy(cmd_buffer->push_constants_data, state->meta.push_constants,
state->meta.push_constants_size);
}
cmd_buffer->push_constants_size = state->meta.push_constants_size;
state->meta.gfx.pipeline = NULL;
state->meta.framebuffer = VK_NULL_HANDLE;
state->meta.pass = VK_NULL_HANDLE;
state->meta.subpass_idx = -1;
state->meta.has_descriptor_state = false;
state->meta.push_constants_size = 0;
}
static struct v3dv_job *
@ -3087,6 +3096,8 @@ v3dv_CmdPushConstants(VkCommandBuffer commandBuffer,
return;
memcpy((uint8_t *) cmd_buffer->push_constants_data + offset, pValues, size);
cmd_buffer->push_constants_size =
MAX2(offset + size, cmd_buffer->push_constants_size);
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_PUSH_CONSTANTS;
cmd_buffer->state.dirty_push_constants_stages |= stageFlags;

2
src/broadcom/vulkan/v3dv_private.h
View File

@ -1335,6 +1335,7 @@ struct v3dv_cmd_buffer_state {
bool has_descriptor_state;
uint32_t push_constants[MAX_PUSH_CONSTANTS_SIZE / 4];
uint32_t push_constants_size;
} meta;
/* Command buffer state for queries */
@ -1474,6 +1475,7 @@ struct v3dv_cmd_buffer {
* pipelineBindPoint in vkCmdBindPipeline. We could probably do more stage
* tunning in the future if it makes sense.
*/
uint32_t push_constants_size;
uint32_t push_constants_data[MAX_PUSH_CONSTANTS_SIZE / 4];
struct v3dv_cl_reloc push_constants_resource;