radv: add set_loc_shader_ptr() helper

[mesa.git] / src / amd / vulkan / radv_query.c

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 2b2e80f4e5b0c4217795928cd7b3a1996c31d3dc..3749e2f43d1179518f6745773bb11dd247d0303a 100644 (file)
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1204,25 +1204,6 @@ void radv_CmdBeginQuery(
        va += pool->stride * query;
 
        emit_begin_query(cmd_buffer, va, pool->type, flags);
-
-       /*
-        * For multiview we have to emit a query for each bit in the mask,
-        * however the first query we emit will get the totals for all the
-        * operations, so we don't want to get a real value in the other
-        * queries. This emits a fake begin/end sequence so the waiting
-        * code gets a completed query value and doesn't hang, but the
-        * query returns 0.
-        */
-       if (cmd_buffer->state.subpass && cmd_buffer->state.subpass->view_mask) {
-               uint64_t avail_va = va + pool->availability_offset + 4 * query;
-
-               for (unsigned i = 0; i < util_bitcount(cmd_buffer->state.subpass->view_mask); i++) {
-                       va += pool->stride;
-                       avail_va += 4;
-                       emit_begin_query(cmd_buffer, va, pool->type, flags);
-                       emit_end_query(cmd_buffer, va, avail_va, pool->type);
-               }
-       }
 }
 
 
@@ -1241,6 +1222,26 @@ void radv_CmdEndQuery(
         * currently be active, which means the BO is already in the list.
         */
        emit_end_query(cmd_buffer, va, avail_va, pool->type);
+
+       /*
+        * For multiview we have to emit a query for each bit in the mask,
+        * however the first query we emit will get the totals for all the
+        * operations, so we don't want to get a real value in the other
+        * queries. This emits a fake begin/end sequence so the waiting
+        * code gets a completed query value and doesn't hang, but the
+        * query returns 0.
+        */
+       if (cmd_buffer->state.subpass && cmd_buffer->state.subpass->view_mask) {
+               uint64_t avail_va = va + pool->availability_offset + 4 * query;
+
+
+               for (unsigned i = 1; i < util_bitcount(cmd_buffer->state.subpass->view_mask); i++) {
+                       va += pool->stride;
+                       avail_va += 4;
+                       emit_begin_query(cmd_buffer, va, pool->type, 0);
+                       emit_end_query(cmd_buffer, va, avail_va, pool->type);
+               }
+       }
 }
 
 void radv_CmdWriteTimestamp(