Rémi Bernon : winevulkan: Move vkQueuePresent FPS trace out of the drivers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 551b535cddeea76f9f277558209e99123d454e59
URL:    https://gitlab.winehq.org/wine/wine/-/commit/551b535cddeea76f9f277558209e991...

Author: Rémi Bernon 
Date:   Sun Dec 10 11:03:54 2023 +0100

winevulkan: Move vkQueuePresent FPS trace out of the drivers.

---

dlls/winemac.drv/vulkan.c | 27 +--------------------------
 dlls/winevulkan/vulkan.c  | 23 +++++++++++++++++++++++
 dlls/winex11.drv/vulkan.c | 29 +----------------------------
 3 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c
index 288bd9af4b1..9cb026076f3 100644
--- a/dlls/winemac.drv/vulkan.c
+++ b/dlls/winemac.drv/vulkan.c
@@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan);

#ifdef SONAME_LIBVULKAN

-WINE_DECLARE_DEBUG_CHANNEL(fps);
-
 typedef VkFlags VkMacOSSurfaceCreateFlagsMVK;
 #define VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK 1000123000

@@ -248,30 +246,7 @@ static VkResult macdrv_vkGetSwapchainImagesKHR(VkDevice device,
 static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info)
 {
     TRACE("%p, %p\n", queue, present_info);
-    VkResult res = pvkQueuePresentKHR(queue, present_info);
-
-    if (TRACE_ON(fps))
-    {
-        static unsigned long frames, frames_total;
-        static long prev_time, start_time;
-        DWORD time;
-
-        time = NtGetTickCount();
-        frames++;
-        frames_total++;
-        if (time - prev_time > 1500)
-        {
-            TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n",
-                    queue, 1000.0 * frames / (time - prev_time),
-                    1000.0 * frames_total / (time - start_time));
-            prev_time = time;
-            frames = 0;
-            if (!start_time)
-                start_time = time;
-        }
-    }
-
-    return res;
+    return pvkQueuePresentKHR(queue, present_info);
 }

static const char *macdrv_get_host_surface_extension(void)
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index e906734a506..21e5952caf4 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -31,6 +31,7 @@
 #include "ntuser.h"

WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
+WINE_DECLARE_DEBUG_CHANNEL(fps);

static PFN_vkCreateInstance p_vkCreateInstance;
 static PFN_vkEnumerateInstanceVersion p_vkEnumerateInstanceVersion;
@@ -1705,6 +1706,28 @@ VkResult wine_vkQueuePresentKHR(VkQueue queue_handle, const VkPresentInfoKHR *pr

if (swapchains != swapchains_buffer) free(swapchains);

+    if (TRACE_ON(fps))
+    {
+        static unsigned long frames, frames_total;
+        static long prev_time, start_time;
+        DWORD time;
+
+        time = NtGetTickCount();
+        frames++;
+        frames_total++;
+
+        if (time - prev_time > 1500)
+        {
+            TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", queue,
+                        1000.0 * frames / (time - prev_time),
+                        1000.0 * frames_total / (time - start_time));
+            prev_time = time;
+            frames = 0;
+
+            if (!start_time) start_time = time;
+        }
+    }
+
     return res;
 }

diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
index 4ff319c7ae2..36b6e3a4162 100644
--- a/dlls/winex11.drv/vulkan.c
+++ b/dlls/winex11.drv/vulkan.c
@@ -47,7 +47,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(vulkan);

#ifdef SONAME_LIBVULKAN
-WINE_DECLARE_DEBUG_CHANNEL(fps);

static pthread_mutex_t vulkan_mutex;

@@ -263,34 +262,8 @@ static VkResult X11DRV_vkGetSwapchainImagesKHR(VkDevice device,

static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info)
 {
-    VkResult res;
-
     TRACE("%p, %p\n", queue, present_info);
-
-    res = pvkQueuePresentKHR(queue, present_info);
-
-    if (TRACE_ON(fps))
-    {
-        static unsigned long frames, frames_total;
-        static long prev_time, start_time;
-        DWORD time;
-
-        time = NtGetTickCount();
-        frames++;
-        frames_total++;
-        if (time - prev_time > 1500)
-        {
-            TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n",
-                    queue, 1000.0 * frames / (time - prev_time),
-                    1000.0 * frames_total / (time - start_time));
-            prev_time = time;
-            frames = 0;
-            if (!start_time)
-                start_time = time;
-        }
-    }
-
-    return res;
+    return pvkQueuePresentKHR(queue, present_info);
 }

static const char *X11DRV_get_host_surface_extension(void)