From d42aa7c288e47c600afeee1339634953644381ce Mon Sep 17 00:00:00 2001
From: David Rohr <drohr@jwdt.org>
Date: Tue, 17 Jun 2025 14:38:25 +0200
Subject: [PATCH] GPU Display: Use 1-argument Vulkan loader which might be
 compatible to more Vulkan implementations

---
 .../display/backend/GPUDisplayBackendOpenGL.cxx   | 15 +++++----------
 .../display/backend/GPUDisplayBackendVulkan.cxx   |  5 ++---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/GPU/GPUTracking/display/backend/GPUDisplayBackendOpenGL.cxx b/GPU/GPUTracking/display/backend/GPUDisplayBackendOpenGL.cxx
index b9bd2731ac641..664734fe6dff0 100644
--- a/GPU/GPUTracking/display/backend/GPUDisplayBackendOpenGL.cxx
+++ b/GPU/GPUTracking/display/backend/GPUDisplayBackendOpenGL.cxx
@@ -61,28 +61,23 @@ GPUDisplayBackendOpenGL::GPUDisplayBackendOpenGL()
   mBackendName = "OpenGL";
 }
 
-#ifdef GPUCA_DISPLAY_GL3W
 int32_t GPUDisplayBackendOpenGL::ExtInit()
 {
+#ifdef GPUCA_DISPLAY_GL3W
   return gl3wInit();
-}
 #else
-int32_t GPUDisplayBackendOpenGL::ExtInit()
-{
   return glewInit();
-}
 #endif
-#ifdef GPUCA_DISPLAY_OPENGL_CORE
+}
+
 bool GPUDisplayBackendOpenGL::CoreProfile()
 {
+#ifdef GPUCA_DISPLAY_OPENGL_CORE
   return true;
-}
 #else
-bool GPUDisplayBackendOpenGL::CoreProfile()
-{
   return false;
-}
 #endif
+}
 
 // #define CHKERR(cmd) {cmd;}
 #define CHKERR(cmd)                                                                                                 \
diff --git a/GPU/GPUTracking/display/backend/GPUDisplayBackendVulkan.cxx b/GPU/GPUTracking/display/backend/GPUDisplayBackendVulkan.cxx
index a7e54db725ae0..0c2af55121b7d 100644
--- a/GPU/GPUTracking/display/backend/GPUDisplayBackendVulkan.cxx
+++ b/GPU/GPUTracking/display/backend/GPUDisplayBackendVulkan.cxx
@@ -340,7 +340,7 @@ double GPUDisplayBackendVulkan::checkDevice(vk::PhysicalDevice device, const std
 
 void GPUDisplayBackendVulkan::createDevice()
 {
-  VULKAN_HPP_DEFAULT_DISPATCHER.init();
+  VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
   vk::ApplicationInfo appInfo{};
   appInfo.pApplicationName = "GPU CA Standalone display";
   appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0);
@@ -355,8 +355,7 @@ void GPUDisplayBackendVulkan::createDevice()
   uint32_t frontendExtensionCount = mDisplay->frontend()->getReqVulkanExtensions(frontendExtensions);
   std::vector<const char*> reqInstanceExtensions(frontendExtensions, frontendExtensions + frontendExtensionCount);
 
-  const std::vector<const char*> reqValidationLayers = {
-    "VK_LAYER_KHRONOS_validation"};
+  const std::vector<const char*> reqValidationLayers = {"VK_LAYER_KHRONOS_validation"};
   auto debugCallback = [](vk::DebugUtilsMessageSeverityFlagBitsEXT messageSeverity, vk::DebugUtilsMessageTypeFlagsEXT messageType, const vk::DebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData) -> VkBool32 {
     static int32_t throwOnError = getenv("GPUCA_VULKAN_VALIDATION_THROW") ? atoi(getenv("GPUCA_VULKAN_VALIDATION_THROW")) : 0;
     static bool showVulkanValidationInfo = getenv("GPUCA_VULKAN_VALIDATION_INFO") && atoi(getenv("GPUCA_VULKAN_VALIDATION_INFO"));