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

Configure Feed

Select the types of activity you want to include in your feed.

a/vk: Return of the justification and function rename

Ryan Pavlik 35d7e852 b816c081

+397 -338
+255 -197
scripts/generate_vk_helpers.py
··· 4 4 """Simple script to update vk_helpers.{c,h}.""" 5 5 6 6 from pathlib import Path 7 - from typing import List, Optional, Tuple 7 + from typing import Callable, Iterable, List, Optional 8 8 9 - # Each tuple is a function name, followed optionally by one or more conditions 10 - # to test in the preprocessor, which will be wrapped in "defined()" 11 - # if they aren't already. Empty tuples insert a blank line. 12 9 13 - DEVICE_FUNCTIONS = [ 14 - ("vkDestroyDevice",), 15 - ("vkDeviceWaitIdle",), 16 - ("vkAllocateMemory",), 17 - ("vkFreeMemory",), 18 - ("vkMapMemory",), 19 - ("vkUnmapMemory",), 20 - (), 21 - ("vkCreateBuffer",), 22 - ("vkDestroyBuffer",), 23 - ("vkBindBufferMemory",), 24 - (), 25 - ("vkCreateImage",), 26 - ("vkDestroyImage",), 27 - ("vkBindImageMemory",), 28 - (), 29 - ("vkGetBufferMemoryRequirements",), 30 - ("vkFlushMappedMemoryRanges",), 31 - ("vkGetImageMemoryRequirements",), 32 - ("vkGetImageMemoryRequirements2KHR",), 33 - ("vkGetImageSubresourceLayout",), 34 - (), 35 - ("vkCreateImageView",), 36 - ("vkDestroyImageView",), 37 - (), 38 - ("vkCreateSampler",), 39 - ("vkDestroySampler",), 40 - (), 41 - ("vkCreateShaderModule",), 42 - ("vkDestroyShaderModule",), 43 - (), 44 - ("vkCreateCommandPool",), 45 - ("vkDestroyCommandPool",), 46 - (), 47 - ("vkAllocateCommandBuffers",), 48 - ("vkBeginCommandBuffer",), 49 - ("vkCmdPipelineBarrier",), 50 - ("vkCmdBeginRenderPass",), 51 - ("vkCmdSetScissor",), 52 - ("vkCmdSetViewport",), 53 - ("vkCmdClearColorImage",), 54 - ("vkCmdEndRenderPass",), 55 - ("vkCmdBindDescriptorSets",), 56 - ("vkCmdBindPipeline",), 57 - ("vkCmdBindVertexBuffers",), 58 - ("vkCmdBindIndexBuffer",), 59 - ("vkCmdDraw",), 60 - ("vkCmdDrawIndexed",), 61 - ("vkCmdDispatch",), 62 - ("vkCmdCopyBuffer",), 63 - ("vkCmdCopyBufferToImage",), 64 - ("vkCmdCopyImage",), 65 - ("vkCmdCopyImageToBuffer",), 66 - ("vkEndCommandBuffer",), 67 - ("vkFreeCommandBuffers",), 68 - (), 69 - ("vkCreateRenderPass",), 70 - ("vkDestroyRenderPass",), 71 - (), 72 - ("vkCreateFramebuffer",), 73 - ("vkDestroyFramebuffer",), 74 - (), 75 - ("vkCreatePipelineCache",), 76 - ("vkDestroyPipelineCache",), 77 - (), 78 - ("vkResetDescriptorPool",), 79 - ("vkCreateDescriptorPool",), 80 - ("vkDestroyDescriptorPool",), 81 - (), 82 - ("vkAllocateDescriptorSets",), 83 - ("vkFreeDescriptorSets",), 84 - (), 85 - ("vkCreateComputePipelines",), 86 - ("vkCreateGraphicsPipelines",), 87 - ("vkDestroyPipeline",), 88 - (), 89 - ("vkCreatePipelineLayout",), 90 - ("vkDestroyPipelineLayout",), 91 - (), 92 - ("vkCreateDescriptorSetLayout",), 93 - ("vkUpdateDescriptorSets",), 94 - ("vkDestroyDescriptorSetLayout",), 95 - (), 96 - ("vkGetDeviceQueue",), 97 - ("vkQueueSubmit",), 98 - ("vkQueueWaitIdle",), 99 - (), 100 - ("vkCreateSemaphore",), 101 - ("vkSignalSemaphoreKHR", "VK_KHR_timeline_semaphore"), 102 - ("vkDestroySemaphore",), 103 - (), 104 - ("vkCreateFence",), 105 - ("vkWaitForFences",), 106 - ("vkGetFenceStatus",), 107 - ("vkDestroyFence",), 108 - ("vkResetFences",), 109 - (), 110 - ("vkCreateSwapchainKHR",), 111 - ("vkDestroySwapchainKHR",), 112 - ("vkGetSwapchainImagesKHR",), 113 - ("vkAcquireNextImageKHR",), 114 - ("vkQueuePresentKHR",), 115 - (), 116 - ("vkGetMemoryWin32HandleKHR", "VK_USE_PLATFORM_WIN32_KHR"), 117 - ("vkImportSemaphoreWin32HandleKHR", "VK_USE_PLATFORM_WIN32_KHR"), 118 - ("vkImportFenceWin32HandleKHR", "VK_USE_PLATFORM_WIN32_KHR"), 119 - ("vkGetMemoryFdKHR", "!defined(VK_USE_PLATFORM_WIN32_KHR)"), 120 - (), 121 - ("vkImportSemaphoreFdKHR", "!defined(VK_USE_PLATFORM_WIN32_KHR)"), 122 - ("vkGetSemaphoreFdKHR", "!defined(VK_USE_PLATFORM_WIN32_KHR)"), 123 - (), 124 - ("vkImportFenceFdKHR", "!defined(VK_USE_PLATFORM_WIN32_KHR)"), 125 - ("vkGetFenceFdKHR", "!defined(VK_USE_PLATFORM_WIN32_KHR)"), 126 - ("vkGetMemoryAndroidHardwareBufferANDROID", "VK_USE_PLATFORM_ANDROID_KHR"), 127 - ( 128 - "vkGetAndroidHardwareBufferPropertiesANDROID", 129 - "VK_USE_PLATFORM_ANDROID_KHR", 130 - ), 131 - (), 132 - ("vkGetPastPresentationTimingGOOGLE",), 133 - ] 134 - INSTANCE_FUNCTIONS = [ 135 - ("vkDestroyInstance",), 136 - ("vkGetDeviceProcAddr",), 137 - ("vkCreateDevice",), 138 - ("vkDestroySurfaceKHR",), 139 - (), 140 - ("vkCreateDebugReportCallbackEXT",), 141 - ("vkDestroyDebugReportCallbackEXT",), 142 - (), 143 - ("vkEnumeratePhysicalDevices",), 144 - ("vkGetPhysicalDeviceProperties",), 145 - ("vkGetPhysicalDeviceProperties2",), 146 - ("vkGetPhysicalDeviceFeatures2",), 147 - ("vkGetPhysicalDeviceMemoryProperties",), 148 - ("vkGetPhysicalDeviceQueueFamilyProperties",), 149 - ("vkGetPhysicalDeviceSurfaceCapabilitiesKHR",), 150 - ("vkGetPhysicalDeviceSurfaceFormatsKHR",), 151 - ("vkGetPhysicalDeviceSurfacePresentModesKHR",), 152 - ("vkGetPhysicalDeviceSurfaceSupportKHR",), 153 - ("vkGetPhysicalDeviceFormatProperties",), 154 - ("vkEnumerateDeviceExtensionProperties",), 155 - ("vkGetPhysicalDeviceImageFormatProperties2",), 156 - (), 157 - ("vkCreateDisplayPlaneSurfaceKHR", "VK_USE_PLATFORM_DISPLAY_KHR"), 158 - ("vkGetDisplayPlaneCapabilitiesKHR", "VK_USE_PLATFORM_DISPLAY_KHR"), 159 - ("vkGetPhysicalDeviceDisplayPropertiesKHR", "VK_USE_PLATFORM_DISPLAY_KHR"), 160 - ("vkGetPhysicalDeviceDisplayPlanePropertiesKHR", "VK_USE_PLATFORM_DISPLAY_KHR"), 161 - ("vkGetDisplayModePropertiesKHR", "VK_USE_PLATFORM_DISPLAY_KHR"), 162 - ("vkReleaseDisplayEXT", "VK_USE_PLATFORM_DISPLAY_KHR"), 163 - (), 164 - ("vkCreateXcbSurfaceKHR", "VK_USE_PLATFORM_XCB_KHR"), 165 - (), 166 - ("vkCreateWaylandSurfaceKHR", "VK_USE_PLATFORM_WAYLAND_KHR"), 167 - (), 168 - ( 169 - "vkAcquireDrmDisplayEXT", 170 - "VK_USE_PLATFORM_WAYLAND_KHR", 171 - "VK_EXT_acquire_drm_display", 172 - ), 173 - ("vkGetDrmDisplayEXT", "VK_USE_PLATFORM_WAYLAND_KHR", "VK_EXT_acquire_drm_display"), 174 - (), 175 - ("vkGetRandROutputDisplayEXT", "VK_USE_PLATFORM_XLIB_XRANDR_EXT"), 176 - ("vkAcquireXlibDisplayEXT", "VK_USE_PLATFORM_XLIB_XRANDR_EXT"), 177 - (), 178 - ("vkCreateAndroidSurfaceKHR", "VK_USE_PLATFORM_ANDROID_KHR"), 179 - (), 180 - ("vkCreateWin32SurfaceKHR", "VK_USE_PLATFORM_WIN32_KHR"), 181 - ] 10 + def get_device_cmds(): 11 + return [ 12 + Cmd("vkDestroyDevice"), 13 + Cmd("vkDeviceWaitIdle"), 14 + Cmd("vkAllocateMemory"), 15 + Cmd("vkFreeMemory"), 16 + Cmd("vkMapMemory"), 17 + Cmd("vkUnmapMemory"), 18 + None, 19 + Cmd("vkCreateBuffer"), 20 + Cmd("vkDestroyBuffer"), 21 + Cmd("vkBindBufferMemory"), 22 + None, 23 + Cmd("vkCreateImage"), 24 + Cmd("vkDestroyImage"), 25 + Cmd("vkBindImageMemory"), 26 + None, 27 + Cmd("vkGetBufferMemoryRequirements"), 28 + Cmd("vkFlushMappedMemoryRanges"), 29 + Cmd("vkGetImageMemoryRequirements"), 30 + Cmd( 31 + "vkGetImageMemoryRequirements2KHR", 32 + member_name="vkGetImageMemoryRequirements2", 33 + ), 34 + Cmd("vkGetImageSubresourceLayout"), 35 + None, 36 + Cmd("vkCreateImageView"), 37 + Cmd("vkDestroyImageView"), 38 + None, 39 + Cmd("vkCreateSampler"), 40 + Cmd("vkDestroySampler"), 41 + None, 42 + Cmd("vkCreateShaderModule"), 43 + Cmd("vkDestroyShaderModule"), 44 + None, 45 + Cmd("vkCreateCommandPool"), 46 + Cmd("vkDestroyCommandPool"), 47 + None, 48 + Cmd("vkAllocateCommandBuffers"), 49 + Cmd("vkBeginCommandBuffer"), 50 + Cmd("vkCmdPipelineBarrier"), 51 + Cmd("vkCmdBeginRenderPass"), 52 + Cmd("vkCmdSetScissor"), 53 + Cmd("vkCmdSetViewport"), 54 + Cmd("vkCmdClearColorImage"), 55 + Cmd("vkCmdEndRenderPass"), 56 + Cmd("vkCmdBindDescriptorSets"), 57 + Cmd("vkCmdBindPipeline"), 58 + Cmd("vkCmdBindVertexBuffers"), 59 + Cmd("vkCmdBindIndexBuffer"), 60 + Cmd("vkCmdDraw"), 61 + Cmd("vkCmdDrawIndexed"), 62 + Cmd("vkCmdDispatch"), 63 + Cmd("vkCmdCopyBuffer"), 64 + Cmd("vkCmdCopyBufferToImage"), 65 + Cmd("vkCmdCopyImage"), 66 + Cmd("vkCmdCopyImageToBuffer"), 67 + Cmd("vkEndCommandBuffer"), 68 + Cmd("vkFreeCommandBuffers"), 69 + None, 70 + Cmd("vkCreateRenderPass"), 71 + Cmd("vkDestroyRenderPass"), 72 + None, 73 + Cmd("vkCreateFramebuffer"), 74 + Cmd("vkDestroyFramebuffer"), 75 + None, 76 + Cmd("vkCreatePipelineCache"), 77 + Cmd("vkDestroyPipelineCache"), 78 + None, 79 + Cmd("vkResetDescriptorPool"), 80 + Cmd("vkCreateDescriptorPool"), 81 + Cmd("vkDestroyDescriptorPool"), 82 + None, 83 + Cmd("vkAllocateDescriptorSets"), 84 + Cmd("vkFreeDescriptorSets"), 85 + None, 86 + Cmd("vkCreateComputePipelines"), 87 + Cmd("vkCreateGraphicsPipelines"), 88 + Cmd("vkDestroyPipeline"), 89 + None, 90 + Cmd("vkCreatePipelineLayout"), 91 + Cmd("vkDestroyPipelineLayout"), 92 + None, 93 + Cmd("vkCreateDescriptorSetLayout"), 94 + Cmd("vkUpdateDescriptorSets"), 95 + Cmd("vkDestroyDescriptorSetLayout"), 96 + None, 97 + Cmd("vkGetDeviceQueue"), 98 + Cmd("vkQueueSubmit"), 99 + Cmd("vkQueueWaitIdle"), 100 + None, 101 + Cmd("vkCreateSemaphore"), 102 + Cmd( 103 + "vkSignalSemaphoreKHR", 104 + member_name="vkSignalSemaphore", 105 + requires=("VK_KHR_timeline_semaphore",), 106 + ), 107 + Cmd("vkDestroySemaphore"), 108 + None, 109 + Cmd("vkCreateFence"), 110 + Cmd("vkWaitForFences"), 111 + Cmd("vkGetFenceStatus"), 112 + Cmd("vkDestroyFence"), 113 + Cmd("vkResetFences"), 114 + None, 115 + Cmd("vkCreateSwapchainKHR"), 116 + Cmd("vkDestroySwapchainKHR"), 117 + Cmd("vkGetSwapchainImagesKHR"), 118 + Cmd("vkAcquireNextImageKHR"), 119 + Cmd("vkQueuePresentKHR"), 120 + None, 121 + Cmd("vkGetMemoryWin32HandleKHR", requires=("VK_USE_PLATFORM_WIN32_KHR",)), 122 + Cmd("vkImportSemaphoreWin32HandleKHR", requires=("VK_USE_PLATFORM_WIN32_KHR",)), 123 + Cmd("vkImportFenceWin32HandleKHR", requires=("VK_USE_PLATFORM_WIN32_KHR",)), 124 + Cmd("vkGetMemoryFdKHR", requires=("!defined(VK_USE_PLATFORM_WIN32_KHR)",)), 125 + None, 126 + Cmd( 127 + "vkImportSemaphoreFdKHR", requires=("!defined(VK_USE_PLATFORM_WIN32_KHR)",) 128 + ), 129 + Cmd("vkGetSemaphoreFdKHR", requires=("!defined(VK_USE_PLATFORM_WIN32_KHR)",)), 130 + None, 131 + Cmd("vkImportFenceFdKHR", requires=("!defined(VK_USE_PLATFORM_WIN32_KHR)",)), 132 + Cmd("vkGetFenceFdKHR", requires=("!defined(VK_USE_PLATFORM_WIN32_KHR)",)), 133 + Cmd( 134 + "vkGetMemoryAndroidHardwareBufferANDROID", 135 + requires=("VK_USE_PLATFORM_ANDROID_KHR",), 136 + ), 137 + Cmd( 138 + "vkGetAndroidHardwareBufferPropertiesANDROID", 139 + requires=("VK_USE_PLATFORM_ANDROID_KHR",), 140 + ), 141 + None, 142 + Cmd("vkGetPastPresentationTimingGOOGLE"), 143 + ] 144 + 145 + 146 + def get_instance_cmds(): 147 + return [ 148 + Cmd("vkDestroyInstance"), 149 + Cmd("vkGetDeviceProcAddr"), 150 + Cmd("vkCreateDevice"), 151 + Cmd("vkDestroySurfaceKHR"), 152 + None, 153 + Cmd("vkCreateDebugReportCallbackEXT"), 154 + Cmd("vkDestroyDebugReportCallbackEXT"), 155 + None, 156 + Cmd("vkEnumeratePhysicalDevices"), 157 + Cmd("vkGetPhysicalDeviceProperties"), 158 + Cmd("vkGetPhysicalDeviceProperties2"), 159 + Cmd("vkGetPhysicalDeviceFeatures2"), 160 + Cmd("vkGetPhysicalDeviceMemoryProperties"), 161 + Cmd("vkGetPhysicalDeviceQueueFamilyProperties"), 162 + Cmd("vkGetPhysicalDeviceSurfaceCapabilitiesKHR"), 163 + Cmd("vkGetPhysicalDeviceSurfaceFormatsKHR"), 164 + Cmd("vkGetPhysicalDeviceSurfacePresentModesKHR"), 165 + Cmd("vkGetPhysicalDeviceSurfaceSupportKHR"), 166 + Cmd("vkGetPhysicalDeviceFormatProperties"), 167 + Cmd("vkEnumerateDeviceExtensionProperties"), 168 + Cmd("vkGetPhysicalDeviceImageFormatProperties2"), 169 + None, 170 + Cmd( 171 + "vkCreateDisplayPlaneSurfaceKHR", requires=("VK_USE_PLATFORM_DISPLAY_KHR",) 172 + ), 173 + Cmd( 174 + "vkGetDisplayPlaneCapabilitiesKHR", 175 + requires=("VK_USE_PLATFORM_DISPLAY_KHR",), 176 + ), 177 + Cmd( 178 + "vkGetPhysicalDeviceDisplayPropertiesKHR", 179 + requires=("VK_USE_PLATFORM_DISPLAY_KHR",), 180 + ), 181 + Cmd( 182 + "vkGetPhysicalDeviceDisplayPlanePropertiesKHR", 183 + requires=("VK_USE_PLATFORM_DISPLAY_KHR",), 184 + ), 185 + Cmd("vkGetDisplayModePropertiesKHR", requires=("VK_USE_PLATFORM_DISPLAY_KHR",)), 186 + Cmd("vkReleaseDisplayEXT", requires=("VK_USE_PLATFORM_DISPLAY_KHR",)), 187 + None, 188 + Cmd("vkCreateXcbSurfaceKHR", requires=("VK_USE_PLATFORM_XCB_KHR",)), 189 + None, 190 + Cmd("vkCreateWaylandSurfaceKHR", requires=("VK_USE_PLATFORM_WAYLAND_KHR",)), 191 + None, 192 + Cmd( 193 + "vkAcquireDrmDisplayEXT", 194 + requires=("VK_USE_PLATFORM_WAYLAND_KHR", "VK_EXT_acquire_drm_display"), 195 + ), 196 + Cmd( 197 + "vkGetDrmDisplayEXT", 198 + requires=("VK_USE_PLATFORM_WAYLAND_KHR", "VK_EXT_acquire_drm_display"), 199 + ), 200 + None, 201 + Cmd( 202 + "vkGetRandROutputDisplayEXT", requires=("VK_USE_PLATFORM_XLIB_XRANDR_EXT",) 203 + ), 204 + Cmd("vkAcquireXlibDisplayEXT", requires=("VK_USE_PLATFORM_XLIB_XRANDR_EXT",)), 205 + None, 206 + Cmd("vkCreateAndroidSurfaceKHR", requires=("VK_USE_PLATFORM_ANDROID_KHR",)), 207 + None, 208 + Cmd("vkCreateWin32SurfaceKHR", requires=("VK_USE_PLATFORM_WIN32_KHR",)), 209 + ] 210 + 182 211 183 212 EXTENSIONS_TO_CHECK = [ 184 213 "VK_GOOGLE_display_timing", ··· 195 224 END_TEMPLATE = "\t// end of GENERATED %s code - do not modify - used by scripts" 196 225 197 226 227 + class Cmd: 228 + def __init__( 229 + self, 230 + name: str, 231 + member_name: Optional[str] = None, 232 + *, 233 + requires: Optional[Iterable[str]] = None, 234 + ): 235 + self.name = name 236 + if not member_name: 237 + member_name = name 238 + self.member_name = member_name 239 + if not requires: 240 + # normalize empty lists to None 241 + requires = None 242 + self.requires = requires 243 + 244 + def __repr__(self) -> str: 245 + args = [repr(self.name)] 246 + if self.member_name != self.name: 247 + args.append(repr(self.member_name)) 248 + if self.requires: 249 + args.append(f"requires={repr(self.requires)}") 250 + return "Function({})".format(", ".join(args)) 251 + 252 + 198 253 def wrap_condition(condition): 199 254 if "defined" in condition: 200 255 return condition ··· 236 291 return self.process_condition(None) 237 292 238 293 239 - def generate_per_function(functions: List[Tuple[str, ...]], per_function_handler): 294 + def generate_per_command( 295 + commands: List[Cmd], per_command_handler: Callable[[Cmd], str] 296 + ): 240 297 conditional = ConditionalGenerator() 241 - for data in functions: 242 - if not data: 298 + for cmd in commands: 299 + if not cmd: 243 300 # empty line 244 301 yield "" 245 302 continue 246 - condition_line = conditional.process_condition(compute_condition(data[1:])) 303 + condition = compute_condition(cmd.requires) 304 + condition_line = conditional.process_condition(condition) 247 305 if condition_line: 248 306 yield condition_line 249 307 250 - yield per_function_handler(data[0]) 308 + yield per_command_handler(cmd) 251 309 252 310 # close any trailing conditions 253 311 condition_line = conditional.finish() ··· 255 313 yield condition_line 256 314 257 315 258 - def generate_structure_members(functions: List[Tuple[str, ...]]): 259 - def per_function(name): 260 - return "\tPFN_{} {};".format(name, name) 316 + def generate_structure_members(commands: List[Cmd]): 317 + def per_command(cmd: Cmd): 318 + return "\tPFN_{} {};".format(cmd.name, cmd.member_name) 261 319 262 - return generate_per_function(functions, per_function) 263 - 264 - 265 - def generate_ins_proc(functions: List[Tuple[str, ...]]): 266 - def per_function(func: str) -> str: 267 - return "\tvk->{} = GET_INS_PROC(vk, {});".format(func, func) 320 + return generate_per_command(commands, per_command) 268 321 269 - return generate_per_function(functions, per_function) 270 322 323 + def generate_proc_macro(macro: str, commands: List[Cmd]): 324 + name_width = max([len(cmd.member_name) for cmd in commands if cmd]) 271 325 272 - def generate_dev_proc(functions: List[Tuple[str, ...]]): 273 - def per_function(func: str) -> str: 274 - return "\tvk->{} = GET_DEV_PROC(vk, {});".format(func, func) 326 + def per_command(cmd: Cmd) -> str: 327 + return "\tvk->{} = {}(vk, {});".format( 328 + cmd.member_name.ljust(name_width), macro, cmd.name 329 + ) 275 330 276 - return generate_per_function(functions, per_function) 331 + return generate_per_command( 332 + commands, 333 + per_command, 334 + ) 277 335 278 336 279 337 def make_ext_member_name(ext: str): ··· 296 354 yield "\tvk->{} = false;".format(make_ext_member_name(ext)) 297 355 298 356 yield "" 299 - yield "\tfor (uint32_t i = 0; i < device_extension_count; i++) {" 357 + yield "\tfor (uint32_t i = 0; i < num_device_extensions; i++) {" 300 358 yield "\t\tconst char *ext = device_extensions[i];" 301 359 yield "" 302 360 ··· 346 404 lines, 347 405 INSTANCE_TEMPLATES["BEGIN"], 348 406 INSTANCE_TEMPLATES["END"], 349 - list(generate_structure_members(INSTANCE_FUNCTIONS)), 407 + list(generate_structure_members(get_instance_cmds())), 350 408 ) 351 409 352 410 lines = replace_middle( 353 411 lines, 354 412 DEVICE_TEMPLATES["BEGIN"], 355 413 DEVICE_TEMPLATES["END"], 356 - list(generate_structure_members(DEVICE_FUNCTIONS)), 414 + list(generate_structure_members(get_device_cmds())), 357 415 ) 358 416 lines = replace_middle( 359 417 lines, ··· 375 433 lines, 376 434 INSTANCE_TEMPLATES["BEGIN"], 377 435 INSTANCE_TEMPLATES["END"], 378 - list(generate_ins_proc(INSTANCE_FUNCTIONS)), 436 + list(generate_proc_macro("GET_INS_PROC", get_instance_cmds())), 379 437 ) 380 438 381 439 lines = replace_middle( 382 440 lines, 383 441 DEVICE_TEMPLATES["BEGIN"], 384 442 DEVICE_TEMPLATES["END"], 385 - list(generate_dev_proc(DEVICE_FUNCTIONS)), 443 + list(generate_proc_macro("GET_DEV_PROC", get_device_cmds())), 386 444 ) 387 445 388 446 lines = replace_middle(
+139 -138
src/xrt/auxiliary/vk/vk_helpers.c
··· 827 827 VkResult 828 828 vk_get_instance_functions(struct vk_bundle *vk) 829 829 { 830 - 830 + // clang-format off 831 831 // beginning of GENERATED instance loader code - do not modify - used by scripts 832 - vk->vkDestroyInstance = GET_INS_PROC(vk, vkDestroyInstance); 833 - vk->vkGetDeviceProcAddr = GET_INS_PROC(vk, vkGetDeviceProcAddr); 834 - vk->vkCreateDevice = GET_INS_PROC(vk, vkCreateDevice); 835 - vk->vkDestroySurfaceKHR = GET_INS_PROC(vk, vkDestroySurfaceKHR); 832 + vk->vkDestroyInstance = GET_INS_PROC(vk, vkDestroyInstance); 833 + vk->vkGetDeviceProcAddr = GET_INS_PROC(vk, vkGetDeviceProcAddr); 834 + vk->vkCreateDevice = GET_INS_PROC(vk, vkCreateDevice); 835 + vk->vkDestroySurfaceKHR = GET_INS_PROC(vk, vkDestroySurfaceKHR); 836 836 837 - vk->vkCreateDebugReportCallbackEXT = GET_INS_PROC(vk, vkCreateDebugReportCallbackEXT); 838 - vk->vkDestroyDebugReportCallbackEXT = GET_INS_PROC(vk, vkDestroyDebugReportCallbackEXT); 837 + vk->vkCreateDebugReportCallbackEXT = GET_INS_PROC(vk, vkCreateDebugReportCallbackEXT); 838 + vk->vkDestroyDebugReportCallbackEXT = GET_INS_PROC(vk, vkDestroyDebugReportCallbackEXT); 839 839 840 - vk->vkEnumeratePhysicalDevices = GET_INS_PROC(vk, vkEnumeratePhysicalDevices); 841 - vk->vkGetPhysicalDeviceProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties); 842 - vk->vkGetPhysicalDeviceProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties2); 843 - vk->vkGetPhysicalDeviceFeatures2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFeatures2); 844 - vk->vkGetPhysicalDeviceMemoryProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceMemoryProperties); 845 - vk->vkGetPhysicalDeviceQueueFamilyProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceQueueFamilyProperties); 846 - vk->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR); 847 - vk->vkGetPhysicalDeviceSurfaceFormatsKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceFormatsKHR); 848 - vk->vkGetPhysicalDeviceSurfacePresentModesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfacePresentModesKHR); 849 - vk->vkGetPhysicalDeviceSurfaceSupportKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceSupportKHR); 850 - vk->vkGetPhysicalDeviceFormatProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties); 851 - vk->vkEnumerateDeviceExtensionProperties = GET_INS_PROC(vk, vkEnumerateDeviceExtensionProperties); 852 - vk->vkGetPhysicalDeviceImageFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceImageFormatProperties2); 840 + vk->vkEnumeratePhysicalDevices = GET_INS_PROC(vk, vkEnumeratePhysicalDevices); 841 + vk->vkGetPhysicalDeviceProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties); 842 + vk->vkGetPhysicalDeviceProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties2); 843 + vk->vkGetPhysicalDeviceFeatures2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFeatures2); 844 + vk->vkGetPhysicalDeviceMemoryProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceMemoryProperties); 845 + vk->vkGetPhysicalDeviceQueueFamilyProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceQueueFamilyProperties); 846 + vk->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR); 847 + vk->vkGetPhysicalDeviceSurfaceFormatsKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceFormatsKHR); 848 + vk->vkGetPhysicalDeviceSurfacePresentModesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfacePresentModesKHR); 849 + vk->vkGetPhysicalDeviceSurfaceSupportKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceSupportKHR); 850 + vk->vkGetPhysicalDeviceFormatProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties); 851 + vk->vkEnumerateDeviceExtensionProperties = GET_INS_PROC(vk, vkEnumerateDeviceExtensionProperties); 852 + vk->vkGetPhysicalDeviceImageFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceImageFormatProperties2); 853 853 854 854 #if defined(VK_USE_PLATFORM_DISPLAY_KHR) 855 - vk->vkCreateDisplayPlaneSurfaceKHR = GET_INS_PROC(vk, vkCreateDisplayPlaneSurfaceKHR); 856 - vk->vkGetDisplayPlaneCapabilitiesKHR = GET_INS_PROC(vk, vkGetDisplayPlaneCapabilitiesKHR); 857 - vk->vkGetPhysicalDeviceDisplayPropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceDisplayPropertiesKHR); 858 - vk->vkGetPhysicalDeviceDisplayPlanePropertiesKHR = 859 - GET_INS_PROC(vk, vkGetPhysicalDeviceDisplayPlanePropertiesKHR); 860 - vk->vkGetDisplayModePropertiesKHR = GET_INS_PROC(vk, vkGetDisplayModePropertiesKHR); 861 - vk->vkReleaseDisplayEXT = GET_INS_PROC(vk, vkReleaseDisplayEXT); 855 + vk->vkCreateDisplayPlaneSurfaceKHR = GET_INS_PROC(vk, vkCreateDisplayPlaneSurfaceKHR); 856 + vk->vkGetDisplayPlaneCapabilitiesKHR = GET_INS_PROC(vk, vkGetDisplayPlaneCapabilitiesKHR); 857 + vk->vkGetPhysicalDeviceDisplayPropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceDisplayPropertiesKHR); 858 + vk->vkGetPhysicalDeviceDisplayPlanePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceDisplayPlanePropertiesKHR); 859 + vk->vkGetDisplayModePropertiesKHR = GET_INS_PROC(vk, vkGetDisplayModePropertiesKHR); 860 + vk->vkReleaseDisplayEXT = GET_INS_PROC(vk, vkReleaseDisplayEXT); 862 861 863 - #endif // defined(VK_USE_PLATFORM_DISPLAY_KHR) 862 + #endif // defined(VK_USE_PLATFORM_DISPLAY_KHR) 864 863 865 864 #if defined(VK_USE_PLATFORM_XCB_KHR) 866 - vk->vkCreateXcbSurfaceKHR = GET_INS_PROC(vk, vkCreateXcbSurfaceKHR); 865 + vk->vkCreateXcbSurfaceKHR = GET_INS_PROC(vk, vkCreateXcbSurfaceKHR); 867 866 868 - #endif // defined(VK_USE_PLATFORM_XCB_KHR) 867 + #endif // defined(VK_USE_PLATFORM_XCB_KHR) 869 868 870 869 #if defined(VK_USE_PLATFORM_WAYLAND_KHR) 871 - vk->vkCreateWaylandSurfaceKHR = GET_INS_PROC(vk, vkCreateWaylandSurfaceKHR); 870 + vk->vkCreateWaylandSurfaceKHR = GET_INS_PROC(vk, vkCreateWaylandSurfaceKHR); 872 871 873 - #endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) 872 + #endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) 874 873 875 874 #if defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display) 876 - vk->vkAcquireDrmDisplayEXT = GET_INS_PROC(vk, vkAcquireDrmDisplayEXT); 877 - vk->vkGetDrmDisplayEXT = GET_INS_PROC(vk, vkGetDrmDisplayEXT); 875 + vk->vkAcquireDrmDisplayEXT = GET_INS_PROC(vk, vkAcquireDrmDisplayEXT); 876 + vk->vkGetDrmDisplayEXT = GET_INS_PROC(vk, vkGetDrmDisplayEXT); 878 877 879 - #endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display) 878 + #endif // defined(VK_USE_PLATFORM_WAYLAND_KHR) && defined(VK_EXT_acquire_drm_display) 880 879 881 880 #if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) 882 - vk->vkGetRandROutputDisplayEXT = GET_INS_PROC(vk, vkGetRandROutputDisplayEXT); 883 - vk->vkAcquireXlibDisplayEXT = GET_INS_PROC(vk, vkAcquireXlibDisplayEXT); 881 + vk->vkGetRandROutputDisplayEXT = GET_INS_PROC(vk, vkGetRandROutputDisplayEXT); 882 + vk->vkAcquireXlibDisplayEXT = GET_INS_PROC(vk, vkAcquireXlibDisplayEXT); 884 883 885 - #endif // defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) 884 + #endif // defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT) 886 885 887 886 #if defined(VK_USE_PLATFORM_ANDROID_KHR) 888 - vk->vkCreateAndroidSurfaceKHR = GET_INS_PROC(vk, vkCreateAndroidSurfaceKHR); 887 + vk->vkCreateAndroidSurfaceKHR = GET_INS_PROC(vk, vkCreateAndroidSurfaceKHR); 889 888 890 - #endif // defined(VK_USE_PLATFORM_ANDROID_KHR) 889 + #endif // defined(VK_USE_PLATFORM_ANDROID_KHR) 891 890 892 891 #if defined(VK_USE_PLATFORM_WIN32_KHR) 893 - vk->vkCreateWin32SurfaceKHR = GET_INS_PROC(vk, vkCreateWin32SurfaceKHR); 894 - #endif // defined(VK_USE_PLATFORM_WIN32_KHR) 892 + vk->vkCreateWin32SurfaceKHR = GET_INS_PROC(vk, vkCreateWin32SurfaceKHR); 893 + #endif // defined(VK_USE_PLATFORM_WIN32_KHR) 895 894 896 895 // end of GENERATED instance loader code - do not modify - used by scripts 897 896 897 + // clang-format on 898 898 return VK_SUCCESS; 899 899 } 900 900 ··· 902 902 vk_get_device_functions(struct vk_bundle *vk) 903 903 { 904 904 905 + // clang-format off 905 906 // beginning of GENERATED device loader code - do not modify - used by scripts 906 - vk->vkDestroyDevice = GET_DEV_PROC(vk, vkDestroyDevice); 907 - vk->vkDeviceWaitIdle = GET_DEV_PROC(vk, vkDeviceWaitIdle); 908 - vk->vkAllocateMemory = GET_DEV_PROC(vk, vkAllocateMemory); 909 - vk->vkFreeMemory = GET_DEV_PROC(vk, vkFreeMemory); 910 - vk->vkMapMemory = GET_DEV_PROC(vk, vkMapMemory); 911 - vk->vkUnmapMemory = GET_DEV_PROC(vk, vkUnmapMemory); 907 + vk->vkDestroyDevice = GET_DEV_PROC(vk, vkDestroyDevice); 908 + vk->vkDeviceWaitIdle = GET_DEV_PROC(vk, vkDeviceWaitIdle); 909 + vk->vkAllocateMemory = GET_DEV_PROC(vk, vkAllocateMemory); 910 + vk->vkFreeMemory = GET_DEV_PROC(vk, vkFreeMemory); 911 + vk->vkMapMemory = GET_DEV_PROC(vk, vkMapMemory); 912 + vk->vkUnmapMemory = GET_DEV_PROC(vk, vkUnmapMemory); 912 913 913 - vk->vkCreateBuffer = GET_DEV_PROC(vk, vkCreateBuffer); 914 - vk->vkDestroyBuffer = GET_DEV_PROC(vk, vkDestroyBuffer); 915 - vk->vkBindBufferMemory = GET_DEV_PROC(vk, vkBindBufferMemory); 914 + vk->vkCreateBuffer = GET_DEV_PROC(vk, vkCreateBuffer); 915 + vk->vkDestroyBuffer = GET_DEV_PROC(vk, vkDestroyBuffer); 916 + vk->vkBindBufferMemory = GET_DEV_PROC(vk, vkBindBufferMemory); 916 917 917 - vk->vkCreateImage = GET_DEV_PROC(vk, vkCreateImage); 918 - vk->vkDestroyImage = GET_DEV_PROC(vk, vkDestroyImage); 919 - vk->vkBindImageMemory = GET_DEV_PROC(vk, vkBindImageMemory); 918 + vk->vkCreateImage = GET_DEV_PROC(vk, vkCreateImage); 919 + vk->vkDestroyImage = GET_DEV_PROC(vk, vkDestroyImage); 920 + vk->vkBindImageMemory = GET_DEV_PROC(vk, vkBindImageMemory); 920 921 921 - vk->vkGetBufferMemoryRequirements = GET_DEV_PROC(vk, vkGetBufferMemoryRequirements); 922 - vk->vkFlushMappedMemoryRanges = GET_DEV_PROC(vk, vkFlushMappedMemoryRanges); 923 - vk->vkGetImageMemoryRequirements = GET_DEV_PROC(vk, vkGetImageMemoryRequirements); 924 - vk->vkGetImageMemoryRequirements2KHR = GET_DEV_PROC(vk, vkGetImageMemoryRequirements2KHR); 925 - vk->vkGetImageSubresourceLayout = GET_DEV_PROC(vk, vkGetImageSubresourceLayout); 922 + vk->vkGetBufferMemoryRequirements = GET_DEV_PROC(vk, vkGetBufferMemoryRequirements); 923 + vk->vkFlushMappedMemoryRanges = GET_DEV_PROC(vk, vkFlushMappedMemoryRanges); 924 + vk->vkGetImageMemoryRequirements = GET_DEV_PROC(vk, vkGetImageMemoryRequirements); 925 + vk->vkGetImageMemoryRequirements2 = GET_DEV_PROC(vk, vkGetImageMemoryRequirements2KHR); 926 + vk->vkGetImageSubresourceLayout = GET_DEV_PROC(vk, vkGetImageSubresourceLayout); 926 927 927 - vk->vkCreateImageView = GET_DEV_PROC(vk, vkCreateImageView); 928 - vk->vkDestroyImageView = GET_DEV_PROC(vk, vkDestroyImageView); 928 + vk->vkCreateImageView = GET_DEV_PROC(vk, vkCreateImageView); 929 + vk->vkDestroyImageView = GET_DEV_PROC(vk, vkDestroyImageView); 929 930 930 - vk->vkCreateSampler = GET_DEV_PROC(vk, vkCreateSampler); 931 - vk->vkDestroySampler = GET_DEV_PROC(vk, vkDestroySampler); 931 + vk->vkCreateSampler = GET_DEV_PROC(vk, vkCreateSampler); 932 + vk->vkDestroySampler = GET_DEV_PROC(vk, vkDestroySampler); 932 933 933 - vk->vkCreateShaderModule = GET_DEV_PROC(vk, vkCreateShaderModule); 934 - vk->vkDestroyShaderModule = GET_DEV_PROC(vk, vkDestroyShaderModule); 934 + vk->vkCreateShaderModule = GET_DEV_PROC(vk, vkCreateShaderModule); 935 + vk->vkDestroyShaderModule = GET_DEV_PROC(vk, vkDestroyShaderModule); 935 936 936 - vk->vkCreateCommandPool = GET_DEV_PROC(vk, vkCreateCommandPool); 937 - vk->vkDestroyCommandPool = GET_DEV_PROC(vk, vkDestroyCommandPool); 937 + vk->vkCreateCommandPool = GET_DEV_PROC(vk, vkCreateCommandPool); 938 + vk->vkDestroyCommandPool = GET_DEV_PROC(vk, vkDestroyCommandPool); 938 939 939 - vk->vkAllocateCommandBuffers = GET_DEV_PROC(vk, vkAllocateCommandBuffers); 940 - vk->vkBeginCommandBuffer = GET_DEV_PROC(vk, vkBeginCommandBuffer); 941 - vk->vkCmdPipelineBarrier = GET_DEV_PROC(vk, vkCmdPipelineBarrier); 942 - vk->vkCmdBeginRenderPass = GET_DEV_PROC(vk, vkCmdBeginRenderPass); 943 - vk->vkCmdSetScissor = GET_DEV_PROC(vk, vkCmdSetScissor); 944 - vk->vkCmdSetViewport = GET_DEV_PROC(vk, vkCmdSetViewport); 945 - vk->vkCmdClearColorImage = GET_DEV_PROC(vk, vkCmdClearColorImage); 946 - vk->vkCmdEndRenderPass = GET_DEV_PROC(vk, vkCmdEndRenderPass); 947 - vk->vkCmdBindDescriptorSets = GET_DEV_PROC(vk, vkCmdBindDescriptorSets); 948 - vk->vkCmdBindPipeline = GET_DEV_PROC(vk, vkCmdBindPipeline); 949 - vk->vkCmdBindVertexBuffers = GET_DEV_PROC(vk, vkCmdBindVertexBuffers); 950 - vk->vkCmdBindIndexBuffer = GET_DEV_PROC(vk, vkCmdBindIndexBuffer); 951 - vk->vkCmdDraw = GET_DEV_PROC(vk, vkCmdDraw); 952 - vk->vkCmdDrawIndexed = GET_DEV_PROC(vk, vkCmdDrawIndexed); 953 - vk->vkCmdDispatch = GET_DEV_PROC(vk, vkCmdDispatch); 954 - vk->vkCmdCopyBuffer = GET_DEV_PROC(vk, vkCmdCopyBuffer); 955 - vk->vkCmdCopyBufferToImage = GET_DEV_PROC(vk, vkCmdCopyBufferToImage); 956 - vk->vkCmdCopyImage = GET_DEV_PROC(vk, vkCmdCopyImage); 957 - vk->vkCmdCopyImageToBuffer = GET_DEV_PROC(vk, vkCmdCopyImageToBuffer); 958 - vk->vkEndCommandBuffer = GET_DEV_PROC(vk, vkEndCommandBuffer); 959 - vk->vkFreeCommandBuffers = GET_DEV_PROC(vk, vkFreeCommandBuffers); 940 + vk->vkAllocateCommandBuffers = GET_DEV_PROC(vk, vkAllocateCommandBuffers); 941 + vk->vkBeginCommandBuffer = GET_DEV_PROC(vk, vkBeginCommandBuffer); 942 + vk->vkCmdPipelineBarrier = GET_DEV_PROC(vk, vkCmdPipelineBarrier); 943 + vk->vkCmdBeginRenderPass = GET_DEV_PROC(vk, vkCmdBeginRenderPass); 944 + vk->vkCmdSetScissor = GET_DEV_PROC(vk, vkCmdSetScissor); 945 + vk->vkCmdSetViewport = GET_DEV_PROC(vk, vkCmdSetViewport); 946 + vk->vkCmdClearColorImage = GET_DEV_PROC(vk, vkCmdClearColorImage); 947 + vk->vkCmdEndRenderPass = GET_DEV_PROC(vk, vkCmdEndRenderPass); 948 + vk->vkCmdBindDescriptorSets = GET_DEV_PROC(vk, vkCmdBindDescriptorSets); 949 + vk->vkCmdBindPipeline = GET_DEV_PROC(vk, vkCmdBindPipeline); 950 + vk->vkCmdBindVertexBuffers = GET_DEV_PROC(vk, vkCmdBindVertexBuffers); 951 + vk->vkCmdBindIndexBuffer = GET_DEV_PROC(vk, vkCmdBindIndexBuffer); 952 + vk->vkCmdDraw = GET_DEV_PROC(vk, vkCmdDraw); 953 + vk->vkCmdDrawIndexed = GET_DEV_PROC(vk, vkCmdDrawIndexed); 954 + vk->vkCmdDispatch = GET_DEV_PROC(vk, vkCmdDispatch); 955 + vk->vkCmdCopyBuffer = GET_DEV_PROC(vk, vkCmdCopyBuffer); 956 + vk->vkCmdCopyBufferToImage = GET_DEV_PROC(vk, vkCmdCopyBufferToImage); 957 + vk->vkCmdCopyImage = GET_DEV_PROC(vk, vkCmdCopyImage); 958 + vk->vkCmdCopyImageToBuffer = GET_DEV_PROC(vk, vkCmdCopyImageToBuffer); 959 + vk->vkEndCommandBuffer = GET_DEV_PROC(vk, vkEndCommandBuffer); 960 + vk->vkFreeCommandBuffers = GET_DEV_PROC(vk, vkFreeCommandBuffers); 960 961 961 - vk->vkCreateRenderPass = GET_DEV_PROC(vk, vkCreateRenderPass); 962 - vk->vkDestroyRenderPass = GET_DEV_PROC(vk, vkDestroyRenderPass); 962 + vk->vkCreateRenderPass = GET_DEV_PROC(vk, vkCreateRenderPass); 963 + vk->vkDestroyRenderPass = GET_DEV_PROC(vk, vkDestroyRenderPass); 963 964 964 - vk->vkCreateFramebuffer = GET_DEV_PROC(vk, vkCreateFramebuffer); 965 - vk->vkDestroyFramebuffer = GET_DEV_PROC(vk, vkDestroyFramebuffer); 965 + vk->vkCreateFramebuffer = GET_DEV_PROC(vk, vkCreateFramebuffer); 966 + vk->vkDestroyFramebuffer = GET_DEV_PROC(vk, vkDestroyFramebuffer); 966 967 967 - vk->vkCreatePipelineCache = GET_DEV_PROC(vk, vkCreatePipelineCache); 968 - vk->vkDestroyPipelineCache = GET_DEV_PROC(vk, vkDestroyPipelineCache); 968 + vk->vkCreatePipelineCache = GET_DEV_PROC(vk, vkCreatePipelineCache); 969 + vk->vkDestroyPipelineCache = GET_DEV_PROC(vk, vkDestroyPipelineCache); 969 970 970 - vk->vkResetDescriptorPool = GET_DEV_PROC(vk, vkResetDescriptorPool); 971 - vk->vkCreateDescriptorPool = GET_DEV_PROC(vk, vkCreateDescriptorPool); 972 - vk->vkDestroyDescriptorPool = GET_DEV_PROC(vk, vkDestroyDescriptorPool); 971 + vk->vkResetDescriptorPool = GET_DEV_PROC(vk, vkResetDescriptorPool); 972 + vk->vkCreateDescriptorPool = GET_DEV_PROC(vk, vkCreateDescriptorPool); 973 + vk->vkDestroyDescriptorPool = GET_DEV_PROC(vk, vkDestroyDescriptorPool); 973 974 974 - vk->vkAllocateDescriptorSets = GET_DEV_PROC(vk, vkAllocateDescriptorSets); 975 - vk->vkFreeDescriptorSets = GET_DEV_PROC(vk, vkFreeDescriptorSets); 975 + vk->vkAllocateDescriptorSets = GET_DEV_PROC(vk, vkAllocateDescriptorSets); 976 + vk->vkFreeDescriptorSets = GET_DEV_PROC(vk, vkFreeDescriptorSets); 976 977 977 - vk->vkCreateComputePipelines = GET_DEV_PROC(vk, vkCreateComputePipelines); 978 - vk->vkCreateGraphicsPipelines = GET_DEV_PROC(vk, vkCreateGraphicsPipelines); 979 - vk->vkDestroyPipeline = GET_DEV_PROC(vk, vkDestroyPipeline); 978 + vk->vkCreateComputePipelines = GET_DEV_PROC(vk, vkCreateComputePipelines); 979 + vk->vkCreateGraphicsPipelines = GET_DEV_PROC(vk, vkCreateGraphicsPipelines); 980 + vk->vkDestroyPipeline = GET_DEV_PROC(vk, vkDestroyPipeline); 980 981 981 - vk->vkCreatePipelineLayout = GET_DEV_PROC(vk, vkCreatePipelineLayout); 982 - vk->vkDestroyPipelineLayout = GET_DEV_PROC(vk, vkDestroyPipelineLayout); 982 + vk->vkCreatePipelineLayout = GET_DEV_PROC(vk, vkCreatePipelineLayout); 983 + vk->vkDestroyPipelineLayout = GET_DEV_PROC(vk, vkDestroyPipelineLayout); 983 984 984 - vk->vkCreateDescriptorSetLayout = GET_DEV_PROC(vk, vkCreateDescriptorSetLayout); 985 - vk->vkUpdateDescriptorSets = GET_DEV_PROC(vk, vkUpdateDescriptorSets); 986 - vk->vkDestroyDescriptorSetLayout = GET_DEV_PROC(vk, vkDestroyDescriptorSetLayout); 985 + vk->vkCreateDescriptorSetLayout = GET_DEV_PROC(vk, vkCreateDescriptorSetLayout); 986 + vk->vkUpdateDescriptorSets = GET_DEV_PROC(vk, vkUpdateDescriptorSets); 987 + vk->vkDestroyDescriptorSetLayout = GET_DEV_PROC(vk, vkDestroyDescriptorSetLayout); 987 988 988 - vk->vkGetDeviceQueue = GET_DEV_PROC(vk, vkGetDeviceQueue); 989 - vk->vkQueueSubmit = GET_DEV_PROC(vk, vkQueueSubmit); 990 - vk->vkQueueWaitIdle = GET_DEV_PROC(vk, vkQueueWaitIdle); 989 + vk->vkGetDeviceQueue = GET_DEV_PROC(vk, vkGetDeviceQueue); 990 + vk->vkQueueSubmit = GET_DEV_PROC(vk, vkQueueSubmit); 991 + vk->vkQueueWaitIdle = GET_DEV_PROC(vk, vkQueueWaitIdle); 991 992 992 - vk->vkCreateSemaphore = GET_DEV_PROC(vk, vkCreateSemaphore); 993 + vk->vkCreateSemaphore = GET_DEV_PROC(vk, vkCreateSemaphore); 993 994 #if defined(VK_KHR_timeline_semaphore) 994 - vk->vkSignalSemaphoreKHR = GET_DEV_PROC(vk, vkSignalSemaphoreKHR); 995 - #endif // defined(VK_KHR_timeline_semaphore) 995 + vk->vkSignalSemaphore = GET_DEV_PROC(vk, vkSignalSemaphoreKHR); 996 + #endif // defined(VK_KHR_timeline_semaphore) 996 997 997 - vk->vkDestroySemaphore = GET_DEV_PROC(vk, vkDestroySemaphore); 998 + vk->vkDestroySemaphore = GET_DEV_PROC(vk, vkDestroySemaphore); 998 999 999 - vk->vkCreateFence = GET_DEV_PROC(vk, vkCreateFence); 1000 - vk->vkWaitForFences = GET_DEV_PROC(vk, vkWaitForFences); 1001 - vk->vkGetFenceStatus = GET_DEV_PROC(vk, vkGetFenceStatus); 1002 - vk->vkDestroyFence = GET_DEV_PROC(vk, vkDestroyFence); 1003 - vk->vkResetFences = GET_DEV_PROC(vk, vkResetFences); 1000 + vk->vkCreateFence = GET_DEV_PROC(vk, vkCreateFence); 1001 + vk->vkWaitForFences = GET_DEV_PROC(vk, vkWaitForFences); 1002 + vk->vkGetFenceStatus = GET_DEV_PROC(vk, vkGetFenceStatus); 1003 + vk->vkDestroyFence = GET_DEV_PROC(vk, vkDestroyFence); 1004 + vk->vkResetFences = GET_DEV_PROC(vk, vkResetFences); 1004 1005 1005 - vk->vkCreateSwapchainKHR = GET_DEV_PROC(vk, vkCreateSwapchainKHR); 1006 - vk->vkDestroySwapchainKHR = GET_DEV_PROC(vk, vkDestroySwapchainKHR); 1007 - vk->vkGetSwapchainImagesKHR = GET_DEV_PROC(vk, vkGetSwapchainImagesKHR); 1008 - vk->vkAcquireNextImageKHR = GET_DEV_PROC(vk, vkAcquireNextImageKHR); 1009 - vk->vkQueuePresentKHR = GET_DEV_PROC(vk, vkQueuePresentKHR); 1006 + vk->vkCreateSwapchainKHR = GET_DEV_PROC(vk, vkCreateSwapchainKHR); 1007 + vk->vkDestroySwapchainKHR = GET_DEV_PROC(vk, vkDestroySwapchainKHR); 1008 + vk->vkGetSwapchainImagesKHR = GET_DEV_PROC(vk, vkGetSwapchainImagesKHR); 1009 + vk->vkAcquireNextImageKHR = GET_DEV_PROC(vk, vkAcquireNextImageKHR); 1010 + vk->vkQueuePresentKHR = GET_DEV_PROC(vk, vkQueuePresentKHR); 1010 1011 1011 1012 #if defined(VK_USE_PLATFORM_WIN32_KHR) 1012 - vk->vkGetMemoryWin32HandleKHR = GET_DEV_PROC(vk, vkGetMemoryWin32HandleKHR); 1013 - vk->vkImportSemaphoreWin32HandleKHR = GET_DEV_PROC(vk, vkImportSemaphoreWin32HandleKHR); 1014 - vk->vkImportFenceWin32HandleKHR = GET_DEV_PROC(vk, vkImportFenceWin32HandleKHR); 1015 - #endif // defined(VK_USE_PLATFORM_WIN32_KHR) 1013 + vk->vkGetMemoryWin32HandleKHR = GET_DEV_PROC(vk, vkGetMemoryWin32HandleKHR); 1014 + vk->vkImportSemaphoreWin32HandleKHR = GET_DEV_PROC(vk, vkImportSemaphoreWin32HandleKHR); 1015 + vk->vkImportFenceWin32HandleKHR = GET_DEV_PROC(vk, vkImportFenceWin32HandleKHR); 1016 + #endif // defined(VK_USE_PLATFORM_WIN32_KHR) 1016 1017 1017 1018 #if !defined(VK_USE_PLATFORM_WIN32_KHR) 1018 - vk->vkGetMemoryFdKHR = GET_DEV_PROC(vk, vkGetMemoryFdKHR); 1019 + vk->vkGetMemoryFdKHR = GET_DEV_PROC(vk, vkGetMemoryFdKHR); 1019 1020 1020 - vk->vkImportSemaphoreFdKHR = GET_DEV_PROC(vk, vkImportSemaphoreFdKHR); 1021 - vk->vkGetSemaphoreFdKHR = GET_DEV_PROC(vk, vkGetSemaphoreFdKHR); 1021 + vk->vkImportSemaphoreFdKHR = GET_DEV_PROC(vk, vkImportSemaphoreFdKHR); 1022 + vk->vkGetSemaphoreFdKHR = GET_DEV_PROC(vk, vkGetSemaphoreFdKHR); 1022 1023 1023 - vk->vkImportFenceFdKHR = GET_DEV_PROC(vk, vkImportFenceFdKHR); 1024 - vk->vkGetFenceFdKHR = GET_DEV_PROC(vk, vkGetFenceFdKHR); 1025 - #endif // !defined(VK_USE_PLATFORM_WIN32_KHR) 1024 + vk->vkImportFenceFdKHR = GET_DEV_PROC(vk, vkImportFenceFdKHR); 1025 + vk->vkGetFenceFdKHR = GET_DEV_PROC(vk, vkGetFenceFdKHR); 1026 + #endif // !defined(VK_USE_PLATFORM_WIN32_KHR) 1026 1027 1027 1028 #if defined(VK_USE_PLATFORM_ANDROID_KHR) 1028 - vk->vkGetMemoryAndroidHardwareBufferANDROID = GET_DEV_PROC(vk, vkGetMemoryAndroidHardwareBufferANDROID); 1029 + vk->vkGetMemoryAndroidHardwareBufferANDROID = GET_DEV_PROC(vk, vkGetMemoryAndroidHardwareBufferANDROID); 1029 1030 vk->vkGetAndroidHardwareBufferPropertiesANDROID = GET_DEV_PROC(vk, vkGetAndroidHardwareBufferPropertiesANDROID); 1030 1031 1031 - #endif // defined(VK_USE_PLATFORM_ANDROID_KHR) 1032 + #endif // defined(VK_USE_PLATFORM_ANDROID_KHR) 1032 1033 1033 - vk->vkGetPastPresentationTimingGOOGLE = GET_DEV_PROC(vk, vkGetPastPresentationTimingGOOGLE); 1034 + vk->vkGetPastPresentationTimingGOOGLE = GET_DEV_PROC(vk, vkGetPastPresentationTimingGOOGLE); 1034 1035 // end of GENERATED device loader code - do not modify - used by scripts 1035 - 1036 + // clang-format on 1036 1037 return VK_SUCCESS; 1037 1038 } 1038 1039
+2 -2
src/xrt/auxiliary/vk/vk_helpers.h
··· 161 161 PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements; 162 162 PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges; 163 163 PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements; 164 - PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR; 164 + PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2; 165 165 PFN_vkGetImageSubresourceLayout vkGetImageSubresourceLayout; 166 166 167 167 PFN_vkCreateImageView vkCreateImageView; ··· 231 231 232 232 PFN_vkCreateSemaphore vkCreateSemaphore; 233 233 #if defined(VK_KHR_timeline_semaphore) 234 - PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR; 234 + PFN_vkSignalSemaphoreKHR vkSignalSemaphore; 235 235 #endif // defined(VK_KHR_timeline_semaphore) 236 236 237 237 PFN_vkDestroySemaphore vkDestroySemaphore;
+1 -1
src/xrt/auxiliary/vk/vk_image_allocator.c
··· 216 216 .sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2, 217 217 .pNext = &memory_dedicated_requirements, 218 218 }; 219 - vk->vkGetImageMemoryRequirements2KHR(vk->device, &memory_requirements_info, &memory_requirements); 219 + vk->vkGetImageMemoryRequirements2(vk->device, &memory_requirements_info, &memory_requirements); 220 220 221 221 /* on tegra we must not use dedicated allocation when it is only preferred to avoid black textures and driver 222 222 * errors when blitting from opengl interop textures.