Module: Mesa Branch: main Commit: 2b685fb09e9419dc21af0bdf75fce8646ed1500d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b685fb09e9419dc21af0bdf75fce8646ed1500d
Author: Karmjit Mahil <[email protected]> Date: Fri Jul 14 13:37:25 2023 +0100 pvr: Allow query stage for barrier sub cmds The function is accounting for the occlusion query job so changing the assert to allow it. Signed-off-by: Karmjit Mahil <[email protected]> Reviewed-by: Frank Binns <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24209> --- src/imagination/vulkan/pvr_queue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/imagination/vulkan/pvr_queue.c b/src/imagination/vulkan/pvr_queue.c index b3022b40268..724e358871c 100644 --- a/src/imagination/vulkan/pvr_queue.c +++ b/src/imagination/vulkan/pvr_queue.c @@ -423,8 +423,10 @@ pvr_process_event_cmd_barrier(struct pvr_device *device, uint32_t src_wait_count = 0; VkResult result; - assert(!(src_mask & ~PVR_PIPELINE_STAGE_ALL_BITS)); - assert(!(dst_mask & ~PVR_PIPELINE_STAGE_ALL_BITS)); + assert(!(src_mask & ~(PVR_PIPELINE_STAGE_ALL_BITS | + PVR_PIPELINE_STAGE_OCCLUSION_QUERY_BIT))); + assert(!(dst_mask & ~(PVR_PIPELINE_STAGE_ALL_BITS | + PVR_PIPELINE_STAGE_OCCLUSION_QUERY_BIT))); u_foreach_bit (stage, src_mask) { if (queue->last_job_signal_sync[stage]) {
