matrixfurry.com / monado
The open source OpenXR runtime
fork atom

scripts, a/vk: Fix calling functions using their Vulkan 1.0 name rather than promoted name

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2233>

authored by

Rylie Pavlik and committed by
Marge Bot 182d8701 764263d1

+27 -10
unified split
+1
doc/changes/compositor/mr.2233.md
··· 1 + Fix: General correctness and valid usage issues.
+20 -4
scripts/generate_vk_helpers.py
··· 8 8 9 9 10 10 def get_device_cmds(): 11 + # NOTE: Be sure to use the Vulkan 1.0 name of functions in here! 12 + # (so, the decorated extension version) 13 + # If you want to alias it in the generated file, use the member_name 14 + # keyword argument. 11 15 return [ 12 16 Cmd("vkDestroyDevice"), 13 17 Cmd("vkDeviceWaitIdle"), ··· 194 198 None, 195 199 Cmd("vkEnumeratePhysicalDevices"), 196 200 Cmd("vkGetPhysicalDeviceProperties"), 197 - Cmd("vkGetPhysicalDeviceProperties2"), 198 - Cmd("vkGetPhysicalDeviceFeatures2"), 201 + Cmd( 202 + "vkGetPhysicalDeviceProperties2KHR", 203 + member_name="vkGetPhysicalDeviceProperties2", 204 + ), 205 + Cmd( 206 + "vkGetPhysicalDeviceFeatures2KHR", 207 + member_name="vkGetPhysicalDeviceFeatures2", 208 + ), 199 209 Cmd("vkGetPhysicalDeviceMemoryProperties"), 200 210 Cmd("vkGetPhysicalDeviceQueueFamilyProperties"), 201 211 Cmd("vkGetPhysicalDeviceSurfaceCapabilitiesKHR"), ··· 203 213 Cmd("vkGetPhysicalDeviceSurfacePresentModesKHR"), 204 214 Cmd("vkGetPhysicalDeviceSurfaceSupportKHR"), 205 215 Cmd("vkGetPhysicalDeviceFormatProperties"), 206 - Cmd("vkGetPhysicalDeviceFormatProperties2KHR", member_name="vkGetPhysicalDeviceFormatProperties2"), 207 - Cmd("vkGetPhysicalDeviceImageFormatProperties2"), 216 + Cmd( 217 + "vkGetPhysicalDeviceFormatProperties2KHR", 218 + member_name="vkGetPhysicalDeviceFormatProperties2", 219 + ), 220 + Cmd( 221 + "vkGetPhysicalDeviceImageFormatProperties2KHR", 222 + member_name="vkGetPhysicalDeviceImageFormatProperties2", 223 + ), 208 224 Cmd("vkGetPhysicalDeviceExternalBufferPropertiesKHR"), 209 225 Cmd("vkGetPhysicalDeviceExternalFencePropertiesKHR"), 210 226 Cmd("vkGetPhysicalDeviceExternalSemaphorePropertiesKHR"),
+3 -3
src/xrt/auxiliary/vk/vk_function_loaders.c
··· 68 68 69 69 vk->vkEnumeratePhysicalDevices = GET_INS_PROC(vk, vkEnumeratePhysicalDevices); 70 70 vk->vkGetPhysicalDeviceProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties); 71 - vk->vkGetPhysicalDeviceProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties2); 72 - vk->vkGetPhysicalDeviceFeatures2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFeatures2); 71 + vk->vkGetPhysicalDeviceProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties2KHR); 72 + vk->vkGetPhysicalDeviceFeatures2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFeatures2KHR); 73 73 vk->vkGetPhysicalDeviceMemoryProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceMemoryProperties); 74 74 vk->vkGetPhysicalDeviceQueueFamilyProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceQueueFamilyProperties); 75 75 vk->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR); ··· 78 78 vk->vkGetPhysicalDeviceSurfaceSupportKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceSupportKHR); 79 79 vk->vkGetPhysicalDeviceFormatProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties); 80 80 vk->vkGetPhysicalDeviceFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties2KHR); 81 - vk->vkGetPhysicalDeviceImageFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceImageFormatProperties2); 81 + vk->vkGetPhysicalDeviceImageFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceImageFormatProperties2KHR); 82 82 vk->vkGetPhysicalDeviceExternalBufferPropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalBufferPropertiesKHR); 83 83 vk->vkGetPhysicalDeviceExternalFencePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalFencePropertiesKHR); 84 84 vk->vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalSemaphorePropertiesKHR);
+3 -3
src/xrt/auxiliary/vk/vk_helpers.h
··· 193 193 194 194 PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices; 195 195 PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; 196 - PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2; 197 - PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2; 196 + PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2; 197 + PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2; 198 198 PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties; 199 199 PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties; 200 200 PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR; ··· 203 203 PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR; 204 204 PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties; 205 205 PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2; 206 - PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2; 206 + PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2; 207 207 PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR; 208 208 PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR; 209 209 PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;