fix!: use the new vulkan-utility-libraries

aejsmith · Nov 8, 2023 · 2eecb26 · 2eecb26
1 parent df15b9d
commit 2eecb26
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/layer.cpp b/layer.cpp
@@ -1,6 +1,6 @@
 #include "vulkan/vulkan.h"
 #include "vulkan/vk_layer.h"
-#include "vulkan/vk_layer_dispatch_table.h"
+#include "vulkan/utility/vk_dispatch_table.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -11,8 +11,8 @@
 #undef VK_LAYER_EXPORT
 #define VK_LAYER_EXPORT extern "C"
 
-static std::map<void*, VkLayerInstanceDispatchTable> gInstanceDispatch;
-static std::map<void*, VkLayerDispatchTable> gDeviceDispatch;
+static std::map<void*, VkuInstanceDispatchTable> gInstanceDispatch;
+static std::map<void*, VkuDeviceDispatchTable> gDeviceDispatch;
 
 static constexpr char kEnvVariable[] = "VULKAN_DEVICE_INDEX";
 
@@ -23,19 +23,19 @@ inline void* GetKey(DispatchableType object)
 }
 
 template <typename DispatchableType>
-inline VkLayerInstanceDispatchTable& GetInstanceDispatch(DispatchableType object)
+inline VkuInstanceDispatchTable& GetInstanceDispatch(DispatchableType object)
 {
     return gInstanceDispatch[GetKey(object)];
 }
 
 template <typename DispatchableType>
-inline VkLayerDispatchTable& GetDeviceDispatch(DispatchableType object)
+inline VkuDeviceDispatchTable& GetDeviceDispatch(DispatchableType object)
 {
     return gDeviceDispatch[GetKey(object)];
 }
 
 static VkResult ChooseDevice(VkInstance                          instance,
-                             const VkLayerInstanceDispatchTable& dispatch,
+                             const VkuInstanceDispatchTable& dispatch,
                              const char* const                   env,
                              VkPhysicalDevice&                   outDevice)
 {
@@ -84,7 +84,7 @@ DeviceChooserLayer_EnumeratePhysicalDevices(VkInstance        instance,
                                             uint32_t*         pPhysicalDeviceCount,
                                             VkPhysicalDevice* pPhysicalDevices)
 {
-    const VkLayerInstanceDispatchTable& dispatch = GetInstanceDispatch(instance);
+    const VkuInstanceDispatchTable& dispatch = GetInstanceDispatch(instance);
 
     const char* const env = getenv(kEnvVariable);
     if (!env)
@@ -121,7 +121,7 @@ DeviceChooserLayer_EnumeratePhysicalDeviceGroupsKHR(VkInstance
                                                     uint32_t*                           pPhysicalDeviceGroupCount,
                                                     VkPhysicalDeviceGroupPropertiesKHR* pPhysicalDeviceGroups)
 {
-    const VkLayerInstanceDispatchTable& dispatch = GetInstanceDispatch(instance);
+    const VkuInstanceDispatchTable& dispatch = GetInstanceDispatch(instance);
 
     const char* const env = getenv(kEnvVariable);
     if (!env)
@@ -198,7 +198,7 @@ DeviceChooserLayer_CreateInstance(const VkInstanceCreateInfo*  pCreateInfo,
     #define GET(func) \
         dispatchTable.func = (PFN_vk##func)gpa(*pInstance, "vk" #func);
 
-    VkLayerInstanceDispatchTable dispatchTable;
+    VkuInstanceDispatchTable dispatchTable;
     dispatchTable.GetInstanceProcAddr = gpa;
     GET(EnumerateDeviceExtensionProperties);
     GET(DestroyInstance);
@@ -259,7 +259,7 @@ DeviceChooserLayer_CreateDevice(VkPhysicalDevice             physicalDevice,
     #define GET(func) \
         dispatchTable.func = (PFN_vk##func)gdpa(*pDevice, "vk" #func);
 
-    VkLayerDispatchTable dispatchTable;
+    VkuDeviceDispatchTable dispatchTable;
     dispatchTable.GetDeviceProcAddr = gdpa;
     GET(DestroyDevice);
 

diff --git a/meson.build b/meson.build
@@ -13,8 +13,8 @@ endif
 if not cpp.has_header('vulkan/vk_layer.h')
     error('Vulkan development files not present (vulkan/vk_layer.h)')
 endif
-if not cpp.has_header('vulkan/vk_layer_dispatch_table.h')
-    error('Vulkan development files not present (vulkan/vk_layer_dispatch_table.h)')
+if not cpp.has_header('vulkan/utility/vk_dispatch_table.h')
+    error('vulkan/utility/vk_dispatch_table.h')
 endif
 
 libdir = get_option('libdir')

diff --git a/vkdevicechooser.json b/vkdevicechooser.json
@@ -4,7 +4,7 @@
         "name": "VK_LAYER_AEJS_DeviceChooserLayer",
         "type": "GLOBAL",
         "library_path": "libvkdevicechooser.so",
-        "api_version": "1.2.131",
+        "api_version": "1.3",
         "implementation_version": "1",
         "description": "Device chooser layer",
         "functions": {