mantle: implement query pool functions, add query pool type (v2)

v2: style fix, end renderpass in grCmdResetQueryPool,
    enable pipelineStatisticsQuery, reorder statistics results

Author: Cherser-s

src/mantle/mantle_cmd_buf.c

@@ -1271,3 +1271,48 @@ GR_VOID GR_STDCALL grCmdResetEvent(
     VKD.vkCmdResetEvent(grCmdBuffer->commandBuffer, grEvent->event,
                         VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT);
 }
+
+GR_VOID GR_STDCALL grCmdBeginQuery(
+    GR_CMD_BUFFER cmdBuffer,
+    GR_QUERY_POOL queryPool,
+    GR_UINT slot,
+    GR_FLAGS flags)
+{
+    LOGT("%p %p %u 0x%X\n", cmdBuffer, queryPool, slot, flags);
+    const GrCmdBuffer* grCmdBuffer = (GrCmdBuffer*)cmdBuffer;
+    const GrDevice* grDevice = GET_OBJ_DEVICE(grCmdBuffer);
+    const GrQueryPool* grQueryPool = (GrQueryPool*)queryPool;
+
+    VKD.vkCmdBeginQuery(grCmdBuffer->commandBuffer, grQueryPool->queryPool, slot,
+                        flags & GR_QUERY_IMPRECISE_DATA ? 0 : VK_QUERY_CONTROL_PRECISE_BIT);
+}
+
+GR_VOID GR_STDCALL grCmdEndQuery(
+    GR_CMD_BUFFER cmdBuffer,
+    GR_QUERY_POOL queryPool,
+    GR_UINT slot)
+{
+    LOGT("%p %p %u\n", cmdBuffer, queryPool, slot);
+    const GrCmdBuffer* grCmdBuffer = (GrCmdBuffer*)cmdBuffer;
+    const GrDevice* grDevice = GET_OBJ_DEVICE(grCmdBuffer);
+    const GrQueryPool* grQueryPool = (GrQueryPool*)queryPool;
+
+    VKD.vkCmdEndQuery(grCmdBuffer->commandBuffer, grQueryPool->queryPool, slot);
+}
+
+GR_VOID GR_STDCALL grCmdResetQueryPool(
+    GR_CMD_BUFFER cmdBuffer,
+    GR_QUERY_POOL queryPool,
+    GR_UINT startQuery,
+    GR_UINT queryCount)
+{
+    LOGT("%p %p %u %u\n", cmdBuffer, queryPool, startQuery, queryCount);
+    GrCmdBuffer* grCmdBuffer = (GrCmdBuffer*)cmdBuffer;
+    const GrDevice* grDevice = GET_OBJ_DEVICE(grCmdBuffer);
+    const GrQueryPool* grQueryPool = (GrQueryPool*)queryPool;
+
+    grCmdBufferEndRenderPass(grCmdBuffer);
+
+    VKD.vkCmdResetQueryPool(grCmdBuffer->commandBuffer, grQueryPool->queryPool,
+                            startQuery, queryCount);
+}

src/mantle/mantle_init_device.c

@@ -523,6 +523,8 @@ GR_RESULT GR_STDCALL grCreateDevice(
             .fillModeNonSolid = VK_TRUE,
             .multiViewport = VK_TRUE,
             .samplerAnisotropy = VK_TRUE,
+            .occlusionQueryPrecise = VK_TRUE,
+            .pipelineStatisticsQuery = VK_TRUE,
             .fragmentStoresAndAtomics = VK_TRUE,
         },
     };

src/mantle/mantle_object.h

@@ -318,6 +318,7 @@ typedef struct _GrShader {
 typedef struct _GrQueryPool {
     GrObject grObj;
     VkQueryPool queryPool;
+    VkQueryType queryType;
 } GrQueryPool;
 
 typedef struct _GrQueue {

src/mantle/mantle_query_sync.c

@@ -52,13 +52,74 @@ GR_RESULT GR_STDCALL grCreateQueryPool(
     *grQueryPool = (GrQueryPool) {
         .grObj = { GR_OBJ_TYPE_QUERY_POOL, grDevice },
         .queryPool = vkQueryPool,
+        .queryType = createInfo.queryType,
     };
 
     *pQueryPool = (GR_QUERY_POOL)grQueryPool;
 
     return GR_SUCCESS;
 }
 
+GR_RESULT GR_STDCALL grGetQueryPoolResults(
+    GR_QUERY_POOL queryPool,
+    GR_UINT startQuery,
+    GR_UINT queryCount,
+    GR_SIZE* pDataSize,
+    GR_VOID* pData)
+{
+    LOGT("%p %u %u %p %p\n", queryPool, startQuery, queryCount, pDataSize, pData);
+    GrQueryPool* grQueryPool = (GrQueryPool*)queryPool;
+
+    if (grQueryPool == NULL) {
+        return GR_ERROR_INVALID_HANDLE;
+    } else if (GET_OBJ_TYPE(grQueryPool) != GR_OBJ_TYPE_QUERY_POOL) {
+        return GR_ERROR_INVALID_OBJECT_TYPE;
+    } else if (pDataSize == NULL) {
+        return GR_ERROR_INVALID_POINTER;
+    }
+
+    const GrDevice* grDevice = GET_OBJ_DEVICE(grQueryPool);
+    unsigned elemSize = grQueryPool->queryType == VK_QUERY_TYPE_OCCLUSION ?
+                        sizeof(uint64_t) : sizeof(GR_PIPELINE_STATISTICS_DATA);
+
+    if (pData == NULL) {
+        *pDataSize = queryCount * elemSize;
+        return GR_SUCCESS;
+    } else if (*pDataSize < queryCount * elemSize) {
+        return GR_ERROR_INVALID_MEMORY_SIZE;
+    }
+
+    VkResult vkRes = VKD.vkGetQueryPoolResults(grDevice->device, grQueryPool->queryPool,
+                                               startQuery, queryCount, *pDataSize, pData,
+                                               elemSize, VK_QUERY_RESULT_64_BIT);
+    if (vkRes != VK_SUCCESS && vkRes != VK_NOT_READY) {
+        LOGE("vkGetQueryPoolResults failed (%d)\n", vkRes);
+    } else if (vkRes == VK_SUCCESS && grQueryPool->queryType == VK_QUERY_TYPE_PIPELINE_STATISTICS) {
+        GR_PIPELINE_STATISTICS_DATA* stats = (GR_PIPELINE_STATISTICS_DATA*)pData;
+
+        // Reorder results to match Mantle (see VkQueryPipelineStatisticFlags)
+        for (unsigned i = 0; i < queryCount; i++) {
+            const uint64_t* vkStat = &((uint64_t*)pData)[11 * i];
+
+            stats[i] = (GR_PIPELINE_STATISTICS_DATA) {
+                .psInvocations  = vkStat[7],
+                .cPrimitives    = vkStat[6],
+                .cInvocations   = vkStat[5],
+                .vsInvocations  = vkStat[2],
+                .gsInvocations  = vkStat[3],
+                .gsPrimitives   = vkStat[4],
+                .iaPrimitives   = vkStat[1],
+                .iaVertices     = vkStat[0],
+                .hsInvocations  = vkStat[8],
+                .dsInvocations  = vkStat[9],
+                .csInvocations  = vkStat[10],
+            };
+        }
+    }
+
+    return getGrResult(vkRes);
+}
+
 GR_RESULT GR_STDCALL grCreateFence(
     GR_DEVICE device,
     const GR_FENCE_CREATE_INFO* pCreateInfo,

src/mantle/stub.c

@@ -58,19 +58,6 @@ GR_RESULT GR_STDCALL grLoadPipeline(
     return GR_UNSUPPORTED;
 }
 
-// Query and Synchronization Functions
-
-GR_RESULT GR_STDCALL grGetQueryPoolResults(
-    GR_QUERY_POOL queryPool,
-    GR_UINT startQuery,
-    GR_UINT queryCount,
-    GR_SIZE* pDataSize,
-    GR_VOID* pData)
-{
-    LOGW("STUB\n");
-    return GR_UNSUPPORTED;
-}
-
 // Multi-Device Management Functions
 
 GR_RESULT GR_STDCALL grOpenSharedMemory(
@@ -142,32 +129,6 @@ GR_VOID GR_STDCALL grCmdMemoryAtomic(
     LOGW("STUB\n");
 }
 
-GR_VOID GR_STDCALL grCmdBeginQuery(
-    GR_CMD_BUFFER cmdBuffer,
-    GR_QUERY_POOL queryPool,
-    GR_UINT slot,
-    GR_FLAGS flags)
-{
-    LOGW("STUB\n");
-}
-
-GR_VOID GR_STDCALL grCmdEndQuery(
-    GR_CMD_BUFFER cmdBuffer,
-    GR_QUERY_POOL queryPool,
-    GR_UINT slot)
-{
-    LOGW("STUB\n");
-}
-
-GR_VOID GR_STDCALL grCmdResetQueryPool(
-    GR_CMD_BUFFER cmdBuffer,
-    GR_QUERY_POOL queryPool,
-    GR_UINT startQuery,
-    GR_UINT queryCount)
-{
-    LOGW("STUB\n");
-}
-
 GR_VOID GR_STDCALL grCmdWriteTimestamp(
     GR_CMD_BUFFER cmdBuffer,
     GR_ENUM timestampType,