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

pvr: Handle PVR_SUB_COMMAND_FLAG_TRANSFER_SERIALIZE_WITH_FRAG.

Browse Source 
The flag was previously named PVR_SUB_COMMAND_FLAG_WAIT_ON_PREVIOUS_FRAG.
Since the next fragment job is also made to wait for the transfer
job to complete, the previous name might have been a bit misleading.

Signed-off-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19957>
This commit is contained in:
Karmjit Mahil
2022-11-16 16:38:18 +00:00
committed by Marge Bot
parent 4276ec9f2a
commit 904a3c4dd7
3 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/imagination/vulkan/pvr_queue.c
View File

@@ -429,6 +429,8 @@ static VkResult pvr_process_event_cmd_barrier(
uint32_t src_syncobj_count = 0;
VkResult result;
assert(sub_cmd->type == PVR_EVENT_TYPE_BARRIER);
assert(!(src_mask & ~PVR_PIPELINE_STAGE_ALL_BITS));
assert(!(dst_mask & ~PVR_PIPELINE_STAGE_ALL_BITS));
@@ -726,9 +728,7 @@ static VkResult pvr_process_cmd_buffer(
sub_cmd,
&cmd_buffer->sub_cmds,
link) {
/* TODO: Process PVR_SUB_COMMAND_FLAG_WAIT_ON_PREVIOUS_FRAG and
* PVR_SUB_COMMAND_FLAG_OCCLUSION_QUERY flags.
*/
/* TODO: Process PVR_SUB_COMMAND_FLAG_OCCLUSION_QUERY flag. */
switch (sub_cmd->type) {
case PVR_SUB_CMD_TYPE_GRAPHICS:
@@ -755,7 +755,30 @@ static VkResult pvr_process_cmd_buffer(
per_cmd_buffer_syncobjs);
break;
case PVR_SUB_CMD_TYPE_TRANSFER:
case PVR_SUB_CMD_TYPE_TRANSFER: {
const bool serialize_with_frag =
sub_cmd->flags & PVR_SUB_COMMAND_FLAG_TRANSFER_SERIALIZE_WITH_FRAG;
if (serialize_with_frag) {
struct pvr_sub_cmd_event frag_to_transfer_barrier = {
.type = PVR_EVENT_TYPE_BARRIER,
.barrier = {
.wait_for_stage_mask = PVR_PIPELINE_STAGE_FRAG_BIT,
.wait_at_stage_mask = PVR_PIPELINE_STAGE_TRANSFER_BIT,
},
};
result = pvr_process_event_cmd_barrier(device,
&frag_to_transfer_barrier,
barriers,
per_cmd_buffer_syncobjs,
per_submit_syncobjs,
queue_syncobjs,
previous_queue_syncobjs);
if (result != VK_SUCCESS)
break;
}
result = pvr_process_transfer_cmds(device,
queue,
&sub_cmd->transfer,
@@ -764,7 +787,30 @@ static VkResult pvr_process_cmd_buffer(
wait_count,
stage_flags,
per_cmd_buffer_syncobjs);
if (serialize_with_frag) {
struct pvr_sub_cmd_event transfer_to_frag_barrier = {
.type = PVR_EVENT_TYPE_BARRIER,
.barrier = {
.wait_for_stage_mask = PVR_PIPELINE_STAGE_TRANSFER_BIT,
.wait_at_stage_mask = PVR_PIPELINE_STAGE_FRAG_BIT,
},
};
if (result != VK_SUCCESS)
break;
result = pvr_process_event_cmd_barrier(device,
&transfer_to_frag_barrier,
barriers,
per_cmd_buffer_syncobjs,
per_submit_syncobjs,
queue_syncobjs,
previous_queue_syncobjs);
}
break;
}
case PVR_SUB_CMD_TYPE_OCCLUSION_QUERY:
result = pvr_process_occlusion_query_cmd(