commit 075e40ea983fddabbb45ee5d511e66536f3c9c11
author Hyunjun Ko <zzoon@igalia.com> Tue Sep 01 05:16:02 2020 +0000
committer Marge Bot <eric+marge@anholt.net> Wed Sep 02 10:49:03 2020 +0000
tree 26b72b3f1bb2d25a1bae774daed1bd855973e7ff
parent b92be738d5696c6192a71a9eed7ea125f19c2545

turnip: Implement VK_EXT_host_query_reset

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6299>

src/freedreno/vulkan/tu_device.c

diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index 3d68a70..3a7b458 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -482,7 +482,7 @@
          features->uniformBufferStandardLayout         = false;
          features->shaderSubgroupExtendedTypes         = false;
          features->separateDepthStencilLayouts         = false;
-         features->hostQueryReset                      = false;
+         features->hostQueryReset                      = true;
          features->timelineSemaphore                   = false;
          features->bufferDeviceAddress                 = false;
          features->bufferDeviceAddressCaptureReplay    = false;
@@ -612,6 +612,12 @@
          features->customBorderColorWithoutFormat = true;
          break;
       }
+      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT: {
+         VkPhysicalDeviceHostQueryResetFeaturesEXT *features =
+            (VkPhysicalDeviceHostQueryResetFeaturesEXT *)ext;
+         features->hostQueryReset = true;
+         break;
+      }
       default:
          break;
       }

src/freedreno/vulkan/tu_extensions.py

diff --git a/src/freedreno/vulkan/tu_extensions.py b/src/freedreno/vulkan/tu_extensions.py
index b51b5aa..16722a3 100644
--- a/src/freedreno/vulkan/tu_extensions.py
+++ b/src/freedreno/vulkan/tu_extensions.py
@@ -93,6 +93,7 @@
     Extension('VK_EXT_conditional_rendering',             1, True),
     Extension('VK_EXT_custom_border_color',              12, True),
     Extension('VK_KHR_multiview',                         1, True),
+    Extension('VK_EXT_host_query_reset',                  1, True),
 ]
 
 MAX_API_VERSION = VkVersion(MAX_API_VERSION)

src/freedreno/vulkan/tu_query.c

diff --git a/src/freedreno/vulkan/tu_query.c b/src/freedreno/vulkan/tu_query.c
index ea4fb29..2bdc4d3 100644
--- a/src/freedreno/vulkan/tu_query.c
+++ b/src/freedreno/vulkan/tu_query.c
@@ -599,6 +599,25 @@
    tu_bo_list_add(&cmdbuf->bo_list, &pool->bo, MSM_SUBMIT_BO_WRITE);
 }
 
+void
+tu_ResetQueryPool(VkDevice device,
+                  VkQueryPool queryPool,
+                  uint32_t firstQuery,
+                  uint32_t queryCount)
+{
+   TU_FROM_HANDLE(tu_query_pool, pool, queryPool);
+
+   for (uint32_t i = 0; i < queryCount; i++) {
+      struct query_slot *slot = slot_address(pool, i + firstQuery);
+      slot->available = 0;
+
+      for (uint32_t k = 0; k < get_result_count(pool); k++) {
+         uint64_t *res = query_result_addr(pool, i + firstQuery, k);
+         *res = 0;
+      }
+   }
+}
+
 static void
 emit_begin_occlusion_query(struct tu_cmd_buffer *cmdbuf,
                            struct tu_query_pool *pool,