From f881e61208736b1f381be819d923606c19fc9a12 Mon Sep 17 00:00:00 2001 From: Shannon McPherson Date: Thu, 19 Mar 2020 13:49:18 -0600 Subject: [PATCH] build: Update known-good for 1.2.135 header Changes: - Updated known-good files - Generated new source files - Modified `object_type_string_helper.h` to address `vkcube` build failures - Modified `CMakeLists.txt` to enable beta extensions - Generated new `generate_vulkan_wrapper.py`, `vulkan_wrapper.cpp`, and `vulkan_wrapper.h` Change-Id: Ic7271350995e8caefbbb7a51ec206f465c59c510 --- CMakeLists.txt | 3 + build-android/vulkan-headers_revision_android | 2 +- common/vulkan_wrapper.cpp | 206 ++++++++++++- common/vulkan_wrapper.h | 96 ++++++ cube/object_type_string_helper.h | 6 +- icd/generated/mock_icd.cpp | 423 ++++++++++++++++++++------ icd/generated/mock_icd.h | 366 +++++++++++++++++----- icd/generated/vk_typemap_helper.h | 417 +++++++++++++++++++++---- scripts/common_codegen.py | 1 + scripts/generate_vulkan_wrapper.py | 388 ++++++++++++++++++++--- scripts/known_good.json | 4 +- vulkaninfo/generated/vulkaninfo.hpp | 80 ++++- 12 files changed, 1700 insertions(+), 292 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec399d6..fea4515 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,9 @@ find_package(PythonInterp 3 QUIET) # This section contains variables that affect development GUIs (e.g. CMake GUI and IDEs), such as option(), folders, and variables # with the CACHE property. +# Enable beta Vulkan extensions +add_definitions(-DVK_ENABLE_BETA_EXTENSIONS) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") option(BUILD_CUBE "Build cube" ON) diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index 9357672..06a9037 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.2.133 \ No newline at end of file +v1.2.135 \ No newline at end of file diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp index 229f58c..c1b4abf 100644 --- a/common/vulkan_wrapper.cpp +++ b/common/vulkan_wrapper.cpp @@ -232,6 +232,22 @@ int InitVulkan(void) { dlsym(libvulkan, "vkGetPhysicalDeviceExternalSemaphoreProperties")); vkGetDescriptorSetLayoutSupport = reinterpret_cast(dlsym(libvulkan, "vkGetDescriptorSetLayoutSupport")); + vkCmdDrawIndirectCount = reinterpret_cast(dlsym(libvulkan, "vkCmdDrawIndirectCount")); + vkCmdDrawIndexedIndirectCount = + reinterpret_cast(dlsym(libvulkan, "vkCmdDrawIndexedIndirectCount")); + vkCreateRenderPass2 = reinterpret_cast(dlsym(libvulkan, "vkCreateRenderPass2")); + vkCmdBeginRenderPass2 = reinterpret_cast(dlsym(libvulkan, "vkCmdBeginRenderPass2")); + vkCmdNextSubpass2 = reinterpret_cast(dlsym(libvulkan, "vkCmdNextSubpass2")); + vkCmdEndRenderPass2 = reinterpret_cast(dlsym(libvulkan, "vkCmdEndRenderPass2")); + vkResetQueryPool = reinterpret_cast(dlsym(libvulkan, "vkResetQueryPool")); + vkGetSemaphoreCounterValue = reinterpret_cast(dlsym(libvulkan, "vkGetSemaphoreCounterValue")); + vkWaitSemaphores = reinterpret_cast(dlsym(libvulkan, "vkWaitSemaphores")); + vkSignalSemaphore = reinterpret_cast(dlsym(libvulkan, "vkSignalSemaphore")); + vkGetBufferDeviceAddress = reinterpret_cast(dlsym(libvulkan, "vkGetBufferDeviceAddress")); + vkGetBufferOpaqueCaptureAddress = + reinterpret_cast(dlsym(libvulkan, "vkGetBufferOpaqueCaptureAddress")); + vkGetDeviceMemoryOpaqueCaptureAddress = + reinterpret_cast(dlsym(libvulkan, "vkGetDeviceMemoryOpaqueCaptureAddress")); vkDestroySurfaceKHR = reinterpret_cast(dlsym(libvulkan, "vkDestroySurfaceKHR")); vkGetPhysicalDeviceSurfaceSupportKHR = reinterpret_cast(dlsym(libvulkan, "vkGetPhysicalDeviceSurfaceSupportKHR")); @@ -315,6 +331,14 @@ int InitVulkan(void) { dlsym(libvulkan, "vkGetPhysicalDeviceExternalFencePropertiesKHR")); vkImportFenceFdKHR = reinterpret_cast(dlsym(libvulkan, "vkImportFenceFdKHR")); vkGetFenceFdKHR = reinterpret_cast(dlsym(libvulkan, "vkGetFenceFdKHR")); + vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR = + reinterpret_cast( + dlsym(libvulkan, "vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR")); + vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR = + reinterpret_cast( + dlsym(libvulkan, "vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR")); + vkAcquireProfilingLockKHR = reinterpret_cast(dlsym(libvulkan, "vkAcquireProfilingLockKHR")); + vkReleaseProfilingLockKHR = reinterpret_cast(dlsym(libvulkan, "vkReleaseProfilingLockKHR")); vkGetPhysicalDeviceSurfaceCapabilities2KHR = reinterpret_cast( dlsym(libvulkan, "vkGetPhysicalDeviceSurfaceCapabilities2KHR")); vkGetPhysicalDeviceSurfaceFormats2KHR = @@ -344,6 +368,22 @@ int InitVulkan(void) { vkCmdDrawIndirectCountKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdDrawIndirectCountKHR")); vkCmdDrawIndexedIndirectCountKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdDrawIndexedIndirectCountKHR")); + vkGetSemaphoreCounterValueKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetSemaphoreCounterValueKHR")); + vkWaitSemaphoresKHR = reinterpret_cast(dlsym(libvulkan, "vkWaitSemaphoresKHR")); + vkSignalSemaphoreKHR = reinterpret_cast(dlsym(libvulkan, "vkSignalSemaphoreKHR")); + vkGetBufferDeviceAddressKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetBufferDeviceAddressKHR")); + vkGetBufferOpaqueCaptureAddressKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetBufferOpaqueCaptureAddressKHR")); + vkGetDeviceMemoryOpaqueCaptureAddressKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetDeviceMemoryOpaqueCaptureAddressKHR")); + vkGetPipelineExecutablePropertiesKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetPipelineExecutablePropertiesKHR")); + vkGetPipelineExecutableStatisticsKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetPipelineExecutableStatisticsKHR")); + vkGetPipelineExecutableInternalRepresentationsKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetPipelineExecutableInternalRepresentationsKHR")); #ifdef VK_USE_PLATFORM_ANDROID_KHR vkCreateAndroidSurfaceKHR = reinterpret_cast(dlsym(libvulkan, "vkCreateAndroidSurfaceKHR")); @@ -394,6 +434,58 @@ int InitVulkan(void) { vkGetPhysicalDeviceXlibPresentationSupportKHR = reinterpret_cast( dlsym(libvulkan, "vkGetPhysicalDeviceXlibPresentationSupportKHR")); #endif + +#ifdef VK_USE_PLATFORM_GGP + vkCreateDeferredOperationKHR = + reinterpret_cast(dlsym(libvulkan, "vkCreateDeferredOperationKHR")); + vkDestroyDeferredOperationKHR = + reinterpret_cast(dlsym(libvulkan, "vkDestroyDeferredOperationKHR")); + vkGetDeferredOperationMaxConcurrencyKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetDeferredOperationMaxConcurrencyKHR")); + vkGetDeferredOperationResultKHR = + reinterpret_cast(dlsym(libvulkan, "vkGetDeferredOperationResultKHR")); + vkDeferredOperationJoinKHR = reinterpret_cast(dlsym(libvulkan, "vkDeferredOperationJoinKHR")); +#endif + +#ifdef VK_USE_PLATFORM_GGP +#endif + +#ifdef VK_USE_PLATFORM_GGP + vkCreateAccelerationStructureKHR = + reinterpret_cast(dlsym(libvulkan, "vkCreateAccelerationStructureKHR")); + vkGetAccelerationStructureMemoryRequirementsKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetAccelerationStructureMemoryRequirementsKHR")); + vkCmdBuildAccelerationStructureKHR = + reinterpret_cast(dlsym(libvulkan, "vkCmdBuildAccelerationStructureKHR")); + vkCmdBuildAccelerationStructureIndirectKHR = reinterpret_cast( + dlsym(libvulkan, "vkCmdBuildAccelerationStructureIndirectKHR")); + vkBuildAccelerationStructureKHR = + reinterpret_cast(dlsym(libvulkan, "vkBuildAccelerationStructureKHR")); + vkCopyAccelerationStructureKHR = + reinterpret_cast(dlsym(libvulkan, "vkCopyAccelerationStructureKHR")); + vkCopyAccelerationStructureToMemoryKHR = + reinterpret_cast(dlsym(libvulkan, "vkCopyAccelerationStructureToMemoryKHR")); + vkCopyMemoryToAccelerationStructureKHR = + reinterpret_cast(dlsym(libvulkan, "vkCopyMemoryToAccelerationStructureKHR")); + vkWriteAccelerationStructuresPropertiesKHR = reinterpret_cast( + dlsym(libvulkan, "vkWriteAccelerationStructuresPropertiesKHR")); + vkCmdCopyAccelerationStructureKHR = + reinterpret_cast(dlsym(libvulkan, "vkCmdCopyAccelerationStructureKHR")); + vkCmdCopyAccelerationStructureToMemoryKHR = reinterpret_cast( + dlsym(libvulkan, "vkCmdCopyAccelerationStructureToMemoryKHR")); + vkCmdCopyMemoryToAccelerationStructureKHR = reinterpret_cast( + dlsym(libvulkan, "vkCmdCopyMemoryToAccelerationStructureKHR")); + vkCmdTraceRaysKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdTraceRaysKHR")); + vkCreateRayTracingPipelinesKHR = + reinterpret_cast(dlsym(libvulkan, "vkCreateRayTracingPipelinesKHR")); + vkGetAccelerationStructureDeviceAddressKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetAccelerationStructureDeviceAddressKHR")); + vkGetRayTracingCaptureReplayShaderGroupHandlesKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetRayTracingCaptureReplayShaderGroupHandlesKHR")); + vkCmdTraceRaysIndirectKHR = reinterpret_cast(dlsym(libvulkan, "vkCmdTraceRaysIndirectKHR")); + vkGetDeviceAccelerationStructureCompatibilityKHR = reinterpret_cast( + dlsym(libvulkan, "vkGetDeviceAccelerationStructureCompatibilityKHR")); +#endif return 1; } @@ -563,6 +655,19 @@ PFN_vkGetPhysicalDeviceExternalBufferProperties vkGetPhysicalDeviceExternalBuffe PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExternalFenceProperties; PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties; PFN_vkGetDescriptorSetLayoutSupport vkGetDescriptorSetLayoutSupport; +PFN_vkCmdDrawIndirectCount vkCmdDrawIndirectCount; +PFN_vkCmdDrawIndexedIndirectCount vkCmdDrawIndexedIndirectCount; +PFN_vkCreateRenderPass2 vkCreateRenderPass2; +PFN_vkCmdBeginRenderPass2 vkCmdBeginRenderPass2; +PFN_vkCmdNextSubpass2 vkCmdNextSubpass2; +PFN_vkCmdEndRenderPass2 vkCmdEndRenderPass2; +PFN_vkResetQueryPool vkResetQueryPool; +PFN_vkGetSemaphoreCounterValue vkGetSemaphoreCounterValue; +PFN_vkWaitSemaphores vkWaitSemaphores; +PFN_vkSignalSemaphore vkSignalSemaphore; +PFN_vkGetBufferDeviceAddress vkGetBufferDeviceAddress; +PFN_vkGetBufferOpaqueCaptureAddress vkGetBufferOpaqueCaptureAddress; +PFN_vkGetDeviceMemoryOpaqueCaptureAddress vkGetDeviceMemoryOpaqueCaptureAddress; PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR; PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR; PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR; @@ -616,6 +721,10 @@ PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR; PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR; PFN_vkImportFenceFdKHR vkImportFenceFdKHR; PFN_vkGetFenceFdKHR vkGetFenceFdKHR; +PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR; +PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR; +PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR; +PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR; PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR; PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR; PFN_vkGetPhysicalDeviceDisplayProperties2KHR vkGetPhysicalDeviceDisplayProperties2KHR; @@ -632,6 +741,15 @@ PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR; PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR; PFN_vkCmdDrawIndirectCountKHR vkCmdDrawIndirectCountKHR; PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR; +PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR; +PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR; +PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR; +PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR; +PFN_vkGetBufferOpaqueCaptureAddressKHR vkGetBufferOpaqueCaptureAddressKHR; +PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR; +PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR; +PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR; +PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR; PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT; PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT; PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT; @@ -646,21 +764,13 @@ PFN_vkCmdEndTransformFeedbackEXT vkCmdEndTransformFeedbackEXT; PFN_vkCmdBeginQueryIndexedEXT vkCmdBeginQueryIndexedEXT; PFN_vkCmdEndQueryIndexedEXT vkCmdEndQueryIndexedEXT; PFN_vkCmdDrawIndirectByteCountEXT vkCmdDrawIndirectByteCountEXT; +PFN_vkGetImageViewHandleNVX vkGetImageViewHandleNVX; PFN_vkCmdDrawIndirectCountAMD vkCmdDrawIndirectCountAMD; PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD; PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD; PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV; PFN_vkCmdBeginConditionalRenderingEXT vkCmdBeginConditionalRenderingEXT; PFN_vkCmdEndConditionalRenderingEXT vkCmdEndConditionalRenderingEXT; -PFN_vkCmdProcessCommandsNVX vkCmdProcessCommandsNVX; -PFN_vkCmdReserveSpaceForCommandsNVX vkCmdReserveSpaceForCommandsNVX; -PFN_vkCreateIndirectCommandsLayoutNVX vkCreateIndirectCommandsLayoutNVX; -PFN_vkDestroyIndirectCommandsLayoutNVX vkDestroyIndirectCommandsLayoutNVX; -PFN_vkCreateObjectTableNVX vkCreateObjectTableNVX; -PFN_vkDestroyObjectTableNVX vkDestroyObjectTableNVX; -PFN_vkRegisterObjectsNVX vkRegisterObjectsNVX; -PFN_vkUnregisterObjectsNVX vkUnregisterObjectsNVX; -PFN_vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX; PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV; PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT; PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT; @@ -694,15 +804,19 @@ PFN_vkCmdBindShadingRateImageNV vkCmdBindShadingRateImageNV; PFN_vkCmdSetViewportShadingRatePaletteNV vkCmdSetViewportShadingRatePaletteNV; PFN_vkCmdSetCoarseSampleOrderNV vkCmdSetCoarseSampleOrderNV; PFN_vkCreateAccelerationStructureNV vkCreateAccelerationStructureNV; +PFN_vkDestroyAccelerationStructureKHR vkDestroyAccelerationStructureKHR; PFN_vkDestroyAccelerationStructureNV vkDestroyAccelerationStructureNV; PFN_vkGetAccelerationStructureMemoryRequirementsNV vkGetAccelerationStructureMemoryRequirementsNV; +PFN_vkBindAccelerationStructureMemoryKHR vkBindAccelerationStructureMemoryKHR; PFN_vkBindAccelerationStructureMemoryNV vkBindAccelerationStructureMemoryNV; PFN_vkCmdBuildAccelerationStructureNV vkCmdBuildAccelerationStructureNV; PFN_vkCmdCopyAccelerationStructureNV vkCmdCopyAccelerationStructureNV; PFN_vkCmdTraceRaysNV vkCmdTraceRaysNV; PFN_vkCreateRayTracingPipelinesNV vkCreateRayTracingPipelinesNV; +PFN_vkGetRayTracingShaderGroupHandlesKHR vkGetRayTracingShaderGroupHandlesKHR; PFN_vkGetRayTracingShaderGroupHandlesNV vkGetRayTracingShaderGroupHandlesNV; PFN_vkGetAccelerationStructureHandleNV vkGetAccelerationStructureHandleNV; +PFN_vkCmdWriteAccelerationStructuresPropertiesKHR vkCmdWriteAccelerationStructuresPropertiesKHR; PFN_vkCmdWriteAccelerationStructuresPropertiesNV vkCmdWriteAccelerationStructuresPropertiesNV; PFN_vkCompileDeferredNV vkCompileDeferredNV; PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT; @@ -715,6 +829,30 @@ PFN_vkCmdDrawMeshTasksIndirectCountNV vkCmdDrawMeshTasksIndirectCountNV; PFN_vkCmdSetExclusiveScissorNV vkCmdSetExclusiveScissorNV; PFN_vkCmdSetCheckpointNV vkCmdSetCheckpointNV; PFN_vkGetQueueCheckpointDataNV vkGetQueueCheckpointDataNV; +PFN_vkInitializePerformanceApiINTEL vkInitializePerformanceApiINTEL; +PFN_vkUninitializePerformanceApiINTEL vkUninitializePerformanceApiINTEL; +PFN_vkCmdSetPerformanceMarkerINTEL vkCmdSetPerformanceMarkerINTEL; +PFN_vkCmdSetPerformanceStreamMarkerINTEL vkCmdSetPerformanceStreamMarkerINTEL; +PFN_vkCmdSetPerformanceOverrideINTEL vkCmdSetPerformanceOverrideINTEL; +PFN_vkAcquirePerformanceConfigurationINTEL vkAcquirePerformanceConfigurationINTEL; +PFN_vkReleasePerformanceConfigurationINTEL vkReleasePerformanceConfigurationINTEL; +PFN_vkQueueSetPerformanceConfigurationINTEL vkQueueSetPerformanceConfigurationINTEL; +PFN_vkGetPerformanceParameterINTEL vkGetPerformanceParameterINTEL; +PFN_vkSetLocalDimmingAMD vkSetLocalDimmingAMD; +PFN_vkGetBufferDeviceAddressEXT vkGetBufferDeviceAddressEXT; +PFN_vkGetPhysicalDeviceToolPropertiesEXT vkGetPhysicalDeviceToolPropertiesEXT; +PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV vkGetPhysicalDeviceCooperativeMatrixPropertiesNV; +PFN_vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV + vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV; +PFN_vkCreateHeadlessSurfaceEXT vkCreateHeadlessSurfaceEXT; +PFN_vkCmdSetLineStippleEXT vkCmdSetLineStippleEXT; +PFN_vkResetQueryPoolEXT vkResetQueryPoolEXT; +PFN_vkGetGeneratedCommandsMemoryRequirementsNV vkGetGeneratedCommandsMemoryRequirementsNV; +PFN_vkCmdPreprocessGeneratedCommandsNV vkCmdPreprocessGeneratedCommandsNV; +PFN_vkCmdExecuteGeneratedCommandsNV vkCmdExecuteGeneratedCommandsNV; +PFN_vkCmdBindPipelineShaderGroupNV vkCmdBindPipelineShaderGroupNV; +PFN_vkCreateIndirectCommandsLayoutNV vkCreateIndirectCommandsLayoutNV; +PFN_vkDestroyIndirectCommandsLayoutNV vkDestroyIndirectCommandsLayoutNV; #ifdef VK_USE_PLATFORM_ANDROID_KHR PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR; @@ -737,6 +875,10 @@ PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK; PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK; #endif +#ifdef VK_USE_PLATFORM_METAL_EXT +PFN_vkCreateMetalSurfaceEXT vkCreateMetalSurfaceEXT; +#endif + #ifdef VK_USE_PLATFORM_VI_NN PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN; #endif @@ -776,6 +918,13 @@ PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV; #ifdef VK_USE_PLATFORM_WIN32_KHR #endif +#ifdef VK_USE_PLATFORM_WIN32_KHR +PFN_vkGetPhysicalDeviceSurfacePresentModes2EXT vkGetPhysicalDeviceSurfacePresentModes2EXT; +PFN_vkAcquireFullScreenExclusiveModeEXT vkAcquireFullScreenExclusiveModeEXT; +PFN_vkReleaseFullScreenExclusiveModeEXT vkReleaseFullScreenExclusiveModeEXT; +PFN_vkGetDeviceGroupSurfacePresentModes2EXT vkGetDeviceGroupSurfacePresentModes2EXT; +#endif + #ifdef VK_USE_PLATFORM_XCB_KHR PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR; PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR; @@ -791,6 +940,45 @@ PFN_vkAcquireXlibDisplayEXT vkAcquireXlibDisplayEXT; PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT; #endif +#ifdef VK_USE_PLATFORM_GGP +PFN_vkCreateStreamDescriptorSurfaceGGP vkCreateStreamDescriptorSurfaceGGP; +#endif + +#ifdef VK_USE_PLATFORM_GGP +#endif + +#ifdef VK_USE_PLATFORM_GGP +PFN_vkCreateDeferredOperationKHR vkCreateDeferredOperationKHR; +PFN_vkDestroyDeferredOperationKHR vkDestroyDeferredOperationKHR; +PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR; +PFN_vkGetDeferredOperationResultKHR vkGetDeferredOperationResultKHR; +PFN_vkDeferredOperationJoinKHR vkDeferredOperationJoinKHR; +#endif + +#ifdef VK_USE_PLATFORM_GGP +#endif + +#ifdef VK_USE_PLATFORM_GGP +PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR; +PFN_vkGetAccelerationStructureMemoryRequirementsKHR vkGetAccelerationStructureMemoryRequirementsKHR; +PFN_vkCmdBuildAccelerationStructureKHR vkCmdBuildAccelerationStructureKHR; +PFN_vkCmdBuildAccelerationStructureIndirectKHR vkCmdBuildAccelerationStructureIndirectKHR; +PFN_vkBuildAccelerationStructureKHR vkBuildAccelerationStructureKHR; +PFN_vkCopyAccelerationStructureKHR vkCopyAccelerationStructureKHR; +PFN_vkCopyAccelerationStructureToMemoryKHR vkCopyAccelerationStructureToMemoryKHR; +PFN_vkCopyMemoryToAccelerationStructureKHR vkCopyMemoryToAccelerationStructureKHR; +PFN_vkWriteAccelerationStructuresPropertiesKHR vkWriteAccelerationStructuresPropertiesKHR; +PFN_vkCmdCopyAccelerationStructureKHR vkCmdCopyAccelerationStructureKHR; +PFN_vkCmdCopyAccelerationStructureToMemoryKHR vkCmdCopyAccelerationStructureToMemoryKHR; +PFN_vkCmdCopyMemoryToAccelerationStructureKHR vkCmdCopyMemoryToAccelerationStructureKHR; +PFN_vkCmdTraceRaysKHR vkCmdTraceRaysKHR; +PFN_vkCreateRayTracingPipelinesKHR vkCreateRayTracingPipelinesKHR; +PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR; +PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR; +PFN_vkCmdTraceRaysIndirectKHR vkCmdTraceRaysIndirectKHR; +PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR; +#endif + #ifdef __cplusplus } #endif diff --git a/common/vulkan_wrapper.h b/common/vulkan_wrapper.h index 957e698..1d7e89b 100644 --- a/common/vulkan_wrapper.h +++ b/common/vulkan_wrapper.h @@ -198,6 +198,21 @@ extern PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExterna extern PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties; extern PFN_vkGetDescriptorSetLayoutSupport vkGetDescriptorSetLayoutSupport; +// VK_core_2 +extern PFN_vkCmdDrawIndirectCount vkCmdDrawIndirectCount; +extern PFN_vkCmdDrawIndexedIndirectCount vkCmdDrawIndexedIndirectCount; +extern PFN_vkCreateRenderPass2 vkCreateRenderPass2; +extern PFN_vkCmdBeginRenderPass2 vkCmdBeginRenderPass2; +extern PFN_vkCmdNextSubpass2 vkCmdNextSubpass2; +extern PFN_vkCmdEndRenderPass2 vkCmdEndRenderPass2; +extern PFN_vkResetQueryPool vkResetQueryPool; +extern PFN_vkGetSemaphoreCounterValue vkGetSemaphoreCounterValue; +extern PFN_vkWaitSemaphores vkWaitSemaphores; +extern PFN_vkSignalSemaphore vkSignalSemaphore; +extern PFN_vkGetBufferDeviceAddress vkGetBufferDeviceAddress; +extern PFN_vkGetBufferOpaqueCaptureAddress vkGetBufferOpaqueCaptureAddress; +extern PFN_vkGetDeviceMemoryOpaqueCaptureAddress vkGetDeviceMemoryOpaqueCaptureAddress; + // VK_KHR_surface extern PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR; extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR; @@ -276,6 +291,8 @@ extern PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR; extern PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR; extern PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR; +// VK_KHR_shader_float16_int8 + // VK_KHR_16bit_storage // VK_KHR_incremental_present @@ -285,6 +302,8 @@ extern PFN_vkCreateDescriptorUpdateTemplateKHR vkCreateDescriptorUpdateTemplateK extern PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR; extern PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR; +// VK_KHR_imageless_framebuffer + // VK_KHR_create_renderpass2 extern PFN_vkCreateRenderPass2KHR vkCreateRenderPass2KHR; extern PFN_vkCmdBeginRenderPass2KHR vkCmdBeginRenderPass2KHR; @@ -303,6 +322,13 @@ extern PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExte extern PFN_vkImportFenceFdKHR vkImportFenceFdKHR; extern PFN_vkGetFenceFdKHR vkGetFenceFdKHR; +// VK_KHR_performance_query +extern PFN_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR + vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR; +extern PFN_vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR; +extern PFN_vkAcquireProfilingLockKHR vkAcquireProfilingLockKHR; +extern PFN_vkReleaseProfilingLockKHR vkReleaseProfilingLockKHR; + // VK_KHR_maintenance2 // VK_KHR_get_surface_capabilities2 @@ -345,14 +371,49 @@ extern PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR extern PFN_vkCmdDrawIndirectCountKHR vkCmdDrawIndirectCountKHR; extern PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR; +// VK_KHR_shader_subgroup_extended_types + // VK_KHR_8bit_storage // VK_KHR_shader_atomic_int64 +// VK_KHR_shader_clock + // VK_KHR_driver_properties +// VK_KHR_shader_float_controls + +// VK_KHR_depth_stencil_resolve + +// VK_KHR_swapchain_mutable_format + +// VK_KHR_timeline_semaphore +extern PFN_vkGetSemaphoreCounterValueKHR vkGetSemaphoreCounterValueKHR; +extern PFN_vkWaitSemaphoresKHR vkWaitSemaphoresKHR; +extern PFN_vkSignalSemaphoreKHR vkSignalSemaphoreKHR; + // VK_KHR_vulkan_memory_model +// VK_KHR_spirv_1_4 + +// VK_KHR_surface_protected_capabilities + +// VK_KHR_separate_depth_stencil_layouts + +// VK_KHR_uniform_buffer_standard_layout + +// VK_KHR_buffer_device_address +extern PFN_vkGetBufferDeviceAddressKHR vkGetBufferDeviceAddressKHR; +extern PFN_vkGetBufferOpaqueCaptureAddressKHR vkGetBufferOpaqueCaptureAddressKHR; +extern PFN_vkGetDeviceMemoryOpaqueCaptureAddressKHR vkGetDeviceMemoryOpaqueCaptureAddressKHR; + +// VK_KHR_pipeline_executable_properties +extern PFN_vkGetPipelineExecutablePropertiesKHR vkGetPipelineExecutablePropertiesKHR; +extern PFN_vkGetPipelineExecutableStatisticsKHR vkGetPipelineExecutableStatisticsKHR; +extern PFN_vkGetPipelineExecutableInternalRepresentationsKHR vkGetPipelineExecutableInternalRepresentationsKHR; + +// VK_KHR_shader_non_semantic_info + #ifdef VK_USE_PLATFORM_ANDROID_KHR // VK_KHR_android_surface extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR; @@ -404,6 +465,41 @@ extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR; extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR; #endif +#ifdef VK_USE_PLATFORM_GGP +// VK_KHR_deferred_host_operations +extern PFN_vkCreateDeferredOperationKHR vkCreateDeferredOperationKHR; +extern PFN_vkDestroyDeferredOperationKHR vkDestroyDeferredOperationKHR; +extern PFN_vkGetDeferredOperationMaxConcurrencyKHR vkGetDeferredOperationMaxConcurrencyKHR; +extern PFN_vkGetDeferredOperationResultKHR vkGetDeferredOperationResultKHR; +extern PFN_vkDeferredOperationJoinKHR vkDeferredOperationJoinKHR; +#endif + +#ifdef VK_USE_PLATFORM_GGP +// VK_KHR_pipeline_library +#endif + +#ifdef VK_USE_PLATFORM_GGP +// VK_KHR_ray_tracing +extern PFN_vkCreateAccelerationStructureKHR vkCreateAccelerationStructureKHR; +extern PFN_vkGetAccelerationStructureMemoryRequirementsKHR vkGetAccelerationStructureMemoryRequirementsKHR; +extern PFN_vkCmdBuildAccelerationStructureKHR vkCmdBuildAccelerationStructureKHR; +extern PFN_vkCmdBuildAccelerationStructureIndirectKHR vkCmdBuildAccelerationStructureIndirectKHR; +extern PFN_vkBuildAccelerationStructureKHR vkBuildAccelerationStructureKHR; +extern PFN_vkCopyAccelerationStructureKHR vkCopyAccelerationStructureKHR; +extern PFN_vkCopyAccelerationStructureToMemoryKHR vkCopyAccelerationStructureToMemoryKHR; +extern PFN_vkCopyMemoryToAccelerationStructureKHR vkCopyMemoryToAccelerationStructureKHR; +extern PFN_vkWriteAccelerationStructuresPropertiesKHR vkWriteAccelerationStructuresPropertiesKHR; +extern PFN_vkCmdCopyAccelerationStructureKHR vkCmdCopyAccelerationStructureKHR; +extern PFN_vkCmdCopyAccelerationStructureToMemoryKHR vkCmdCopyAccelerationStructureToMemoryKHR; +extern PFN_vkCmdCopyMemoryToAccelerationStructureKHR vkCmdCopyMemoryToAccelerationStructureKHR; +extern PFN_vkCmdTraceRaysKHR vkCmdTraceRaysKHR; +extern PFN_vkCreateRayTracingPipelinesKHR vkCreateRayTracingPipelinesKHR; +extern PFN_vkGetAccelerationStructureDeviceAddressKHR vkGetAccelerationStructureDeviceAddressKHR; +extern PFN_vkGetRayTracingCaptureReplayShaderGroupHandlesKHR vkGetRayTracingCaptureReplayShaderGroupHandlesKHR; +extern PFN_vkCmdTraceRaysIndirectKHR vkCmdTraceRaysIndirectKHR; +extern PFN_vkGetDeviceAccelerationStructureCompatibilityKHR vkGetDeviceAccelerationStructureCompatibilityKHR; +#endif + #ifdef __cplusplus } #endif diff --git a/cube/object_type_string_helper.h b/cube/object_type_string_helper.h index eb79ba3..15be12d 100644 --- a/cube/object_type_string_helper.h +++ b/cube/object_type_string_helper.h @@ -34,8 +34,6 @@ static inline const char* string_VkObjectType(VkObjectType input_value) { case VK_OBJECT_TYPE_QUERY_POOL: return "VK_OBJECT_TYPE_QUERY_POOL"; - case VK_OBJECT_TYPE_OBJECT_TABLE_NVX: - return "VK_OBJECT_TYPE_OBJECT_TABLE_NVX"; case VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION: return "VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION"; case VK_OBJECT_TYPE_SEMAPHORE: @@ -46,8 +44,8 @@ static inline const char* string_VkObjectType(VkObjectType input_value) return "VK_OBJECT_TYPE_SWAPCHAIN_KHR"; case VK_OBJECT_TYPE_SAMPLER: return "VK_OBJECT_TYPE_SAMPLER"; - case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX: - return "VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX"; + case VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV: + return "VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV"; case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: return "VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT"; case VK_OBJECT_TYPE_IMAGE: diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 04dd7cb..bdf5a10 100644 --- a/icd/generated/mock_icd.cpp +++ b/icd/generated/mock_icd.cpp @@ -3097,6 +3097,51 @@ static VKAPI_ATTR uint64_t VKAPI_CALL GetDeviceMemoryOpaqueCaptureAddressKHR( return VK_SUCCESS; } +#ifdef VK_ENABLE_BETA_EXTENSIONS + +static VKAPI_ATTR VkResult VKAPI_CALL CreateDeferredOperationKHR( + VkDevice device, + const VkAllocationCallbacks* pAllocator, + VkDeferredOperationKHR* pDeferredOperation) +{ + unique_lock_t lock(global_lock); + *pDeferredOperation = (VkDeferredOperationKHR)global_unique_handle++; + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL DestroyDeferredOperationKHR( + VkDevice device, + VkDeferredOperationKHR operation, + const VkAllocationCallbacks* pAllocator) +{ +//Destroy object +} + +static VKAPI_ATTR uint32_t VKAPI_CALL GetDeferredOperationMaxConcurrencyKHR( + VkDevice device, + VkDeferredOperationKHR operation) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL GetDeferredOperationResultKHR( + VkDevice device, + VkDeferredOperationKHR operation) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL DeferredOperationJoinKHR( + VkDevice device, + VkDeferredOperationKHR operation) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} +#endif /* VK_ENABLE_BETA_EXTENSIONS */ + static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutablePropertiesKHR( VkDevice device, @@ -3128,6 +3173,9 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutableInternalRepresentatio return VK_SUCCESS; } +#ifdef VK_ENABLE_BETA_EXTENSIONS +#endif /* VK_ENABLE_BETA_EXTENSIONS */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateDebugReportCallbackEXT( @@ -3404,89 +3452,6 @@ static VKAPI_ATTR void VKAPI_CALL CmdEndConditionalRenderingEXT( } -static VKAPI_ATTR void VKAPI_CALL CmdProcessCommandsNVX( - VkCommandBuffer commandBuffer, - const VkCmdProcessCommandsInfoNVX* pProcessCommandsInfo) -{ -//Not a CREATE or DESTROY function -} - -static VKAPI_ATTR void VKAPI_CALL CmdReserveSpaceForCommandsNVX( - VkCommandBuffer commandBuffer, - const VkCmdReserveSpaceForCommandsInfoNVX* pReserveSpaceInfo) -{ -//Not a CREATE or DESTROY function -} - -static VKAPI_ATTR VkResult VKAPI_CALL CreateIndirectCommandsLayoutNVX( - VkDevice device, - const VkIndirectCommandsLayoutCreateInfoNVX* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - VkIndirectCommandsLayoutNVX* pIndirectCommandsLayout) -{ - unique_lock_t lock(global_lock); - *pIndirectCommandsLayout = (VkIndirectCommandsLayoutNVX)global_unique_handle++; - return VK_SUCCESS; -} - -static VKAPI_ATTR void VKAPI_CALL DestroyIndirectCommandsLayoutNVX( - VkDevice device, - VkIndirectCommandsLayoutNVX indirectCommandsLayout, - const VkAllocationCallbacks* pAllocator) -{ -//Destroy object -} - -static VKAPI_ATTR VkResult VKAPI_CALL CreateObjectTableNVX( - VkDevice device, - const VkObjectTableCreateInfoNVX* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - VkObjectTableNVX* pObjectTable) -{ - unique_lock_t lock(global_lock); - *pObjectTable = (VkObjectTableNVX)global_unique_handle++; - return VK_SUCCESS; -} - -static VKAPI_ATTR void VKAPI_CALL DestroyObjectTableNVX( - VkDevice device, - VkObjectTableNVX objectTable, - const VkAllocationCallbacks* pAllocator) -{ -//Destroy object -} - -static VKAPI_ATTR VkResult VKAPI_CALL RegisterObjectsNVX( - VkDevice device, - VkObjectTableNVX objectTable, - uint32_t objectCount, - const VkObjectTableEntryNVX* const* ppObjectTableEntries, - const uint32_t* pObjectIndices) -{ -//Not a CREATE or DESTROY function - return VK_SUCCESS; -} - -static VKAPI_ATTR VkResult VKAPI_CALL UnregisterObjectsNVX( - VkDevice device, - VkObjectTableNVX objectTable, - uint32_t objectCount, - const VkObjectEntryTypeNVX* pObjectEntryTypes, - const uint32_t* pObjectIndices) -{ -//Not a CREATE or DESTROY function - return VK_SUCCESS; -} - -static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceGeneratedCommandsPropertiesNVX( - VkPhysicalDevice physicalDevice, - VkDeviceGeneratedCommandsFeaturesNVX* pFeatures, - VkDeviceGeneratedCommandsLimitsNVX* pLimits) -{ -//Not a CREATE or DESTROY function -} - - static VKAPI_ATTR void VKAPI_CALL CmdSetViewportWScalingNV( VkCommandBuffer commandBuffer, uint32_t firstViewport, @@ -3877,13 +3842,21 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureNV( VkAccelerationStructureNV* pAccelerationStructure) { unique_lock_t lock(global_lock); - *pAccelerationStructure = (VkAccelerationStructureNV)global_unique_handle++; + *pAccelerationStructure = (VkAccelerationStructureNV)CreateDispObjHandle(); return VK_SUCCESS; } +static VKAPI_ATTR void VKAPI_CALL DestroyAccelerationStructureKHR( + VkDevice device, + VkAccelerationStructureKHR accelerationStructure, + const VkAllocationCallbacks* pAllocator) +{ +//Destroy object +} + static VKAPI_ATTR void VKAPI_CALL DestroyAccelerationStructureNV( VkDevice device, - VkAccelerationStructureNV accelerationStructure, + VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks* pAllocator) { //Destroy object @@ -3897,10 +3870,19 @@ static VKAPI_ATTR void VKAPI_CALL GetAccelerationStructureMemoryRequirementsNV( //Not a CREATE or DESTROY function } +static VKAPI_ATTR VkResult VKAPI_CALL BindAccelerationStructureMemoryKHR( + VkDevice device, + uint32_t bindInfoCount, + const VkBindAccelerationStructureMemoryInfoKHR* pBindInfos) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + static VKAPI_ATTR VkResult VKAPI_CALL BindAccelerationStructureMemoryNV( VkDevice device, uint32_t bindInfoCount, - const VkBindAccelerationStructureMemoryInfoNV* pBindInfos) + const VkBindAccelerationStructureMemoryInfoKHR* pBindInfos) { //Not a CREATE or DESTROY function return VK_SUCCESS; @@ -3912,8 +3894,8 @@ static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureNV( VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, - VkAccelerationStructureNV dst, - VkAccelerationStructureNV src, + VkAccelerationStructureKHR dst, + VkAccelerationStructureKHR src, VkBuffer scratch, VkDeviceSize scratchOffset) { @@ -3922,9 +3904,9 @@ static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureNV( static VKAPI_ATTR void VKAPI_CALL CmdCopyAccelerationStructureNV( VkCommandBuffer commandBuffer, - VkAccelerationStructureNV dst, - VkAccelerationStructureNV src, - VkCopyAccelerationStructureModeNV mode) + VkAccelerationStructureKHR dst, + VkAccelerationStructureKHR src, + VkCopyAccelerationStructureModeKHR mode) { //Not a CREATE or DESTROY function } @@ -3964,6 +3946,18 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateRayTracingPipelinesNV( return VK_SUCCESS; } +static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingShaderGroupHandlesKHR( + VkDevice device, + VkPipeline pipeline, + uint32_t firstGroup, + uint32_t groupCount, + size_t dataSize, + void* pData) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingShaderGroupHandlesNV( VkDevice device, VkPipeline pipeline, @@ -3978,7 +3972,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingShaderGroupHandlesNV( static VKAPI_ATTR VkResult VKAPI_CALL GetAccelerationStructureHandleNV( VkDevice device, - VkAccelerationStructureNV accelerationStructure, + VkAccelerationStructureKHR accelerationStructure, size_t dataSize, void* pData) { @@ -3986,10 +3980,21 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetAccelerationStructureHandleNV( return VK_SUCCESS; } +static VKAPI_ATTR void VKAPI_CALL CmdWriteAccelerationStructuresPropertiesKHR( + VkCommandBuffer commandBuffer, + uint32_t accelerationStructureCount, + const VkAccelerationStructureKHR* pAccelerationStructures, + VkQueryType queryType, + VkQueryPool queryPool, + uint32_t firstQuery) +{ +//Not a CREATE or DESTROY function +} + static VKAPI_ATTR void VKAPI_CALL CmdWriteAccelerationStructuresPropertiesNV( VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, - const VkAccelerationStructureNV* pAccelerationStructures, + const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery) @@ -4358,6 +4363,238 @@ static VKAPI_ATTR void VKAPI_CALL ResetQueryPoolEXT( +static VKAPI_ATTR void VKAPI_CALL GetGeneratedCommandsMemoryRequirementsNV( + VkDevice device, + const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo, + VkMemoryRequirements2* pMemoryRequirements) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdPreprocessGeneratedCommandsNV( + VkCommandBuffer commandBuffer, + const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdExecuteGeneratedCommandsNV( + VkCommandBuffer commandBuffer, + VkBool32 isPreprocessed, + const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdBindPipelineShaderGroupNV( + VkCommandBuffer commandBuffer, + VkPipelineBindPoint pipelineBindPoint, + VkPipeline pipeline, + uint32_t groupIndex) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR VkResult VKAPI_CALL CreateIndirectCommandsLayoutNV( + VkDevice device, + const VkIndirectCommandsLayoutCreateInfoNV* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkIndirectCommandsLayoutNV* pIndirectCommandsLayout) +{ + unique_lock_t lock(global_lock); + *pIndirectCommandsLayout = (VkIndirectCommandsLayoutNV)global_unique_handle++; + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL DestroyIndirectCommandsLayoutNV( + VkDevice device, + VkIndirectCommandsLayoutNV indirectCommandsLayout, + const VkAllocationCallbacks* pAllocator) +{ +//Destroy object +} + + + + + + +#ifdef VK_ENABLE_BETA_EXTENSIONS + +static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( + VkDevice device, + const VkAccelerationStructureCreateInfoKHR* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkAccelerationStructureKHR* pAccelerationStructure) +{ + unique_lock_t lock(global_lock); + *pAccelerationStructure = (VkAccelerationStructureKHR)global_unique_handle++; + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL GetAccelerationStructureMemoryRequirementsKHR( + VkDevice device, + const VkAccelerationStructureMemoryRequirementsInfoKHR* pInfo, + VkMemoryRequirements2* pMemoryRequirements) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureKHR( + VkCommandBuffer commandBuffer, + uint32_t infoCount, + const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, + const VkAccelerationStructureBuildOffsetInfoKHR* const* ppOffsetInfos) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureIndirectKHR( + VkCommandBuffer commandBuffer, + const VkAccelerationStructureBuildGeometryInfoKHR* pInfo, + VkBuffer indirectBuffer, + VkDeviceSize indirectOffset, + uint32_t indirectStride) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR VkResult VKAPI_CALL BuildAccelerationStructureKHR( + VkDevice device, + uint32_t infoCount, + const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, + const VkAccelerationStructureBuildOffsetInfoKHR* const* ppOffsetInfos) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL CopyAccelerationStructureKHR( + VkDevice device, + const VkCopyAccelerationStructureInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL CopyAccelerationStructureToMemoryKHR( + VkDevice device, + const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL CopyMemoryToAccelerationStructureKHR( + VkDevice device, + const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL WriteAccelerationStructuresPropertiesKHR( + VkDevice device, + uint32_t accelerationStructureCount, + const VkAccelerationStructureKHR* pAccelerationStructures, + VkQueryType queryType, + size_t dataSize, + void* pData, + size_t stride) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL CmdCopyAccelerationStructureKHR( + VkCommandBuffer commandBuffer, + const VkCopyAccelerationStructureInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdCopyAccelerationStructureToMemoryKHR( + VkCommandBuffer commandBuffer, + const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToAccelerationStructureKHR( + VkCommandBuffer commandBuffer, + const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdTraceRaysKHR( + VkCommandBuffer commandBuffer, + const VkStridedBufferRegionKHR* pRaygenShaderBindingTable, + const VkStridedBufferRegionKHR* pMissShaderBindingTable, + const VkStridedBufferRegionKHR* pHitShaderBindingTable, + const VkStridedBufferRegionKHR* pCallableShaderBindingTable, + uint32_t width, + uint32_t height, + uint32_t depth) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR VkResult VKAPI_CALL CreateRayTracingPipelinesKHR( + VkDevice device, + VkPipelineCache pipelineCache, + uint32_t createInfoCount, + const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, + const VkAllocationCallbacks* pAllocator, + VkPipeline* pPipelines) +{ + unique_lock_t lock(global_lock); + for (uint32_t i = 0; i < createInfoCount; ++i) { + pPipelines[i] = (VkPipeline)global_unique_handle++; + } + return VK_SUCCESS; +} + +static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetAccelerationStructureDeviceAddressKHR( + VkDevice device, + const VkAccelerationStructureDeviceAddressInfoKHR* pInfo) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingCaptureReplayShaderGroupHandlesKHR( + VkDevice device, + VkPipeline pipeline, + uint32_t firstGroup, + uint32_t groupCount, + size_t dataSize, + void* pData) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL CmdTraceRaysIndirectKHR( + VkCommandBuffer commandBuffer, + const VkStridedBufferRegionKHR* pRaygenShaderBindingTable, + const VkStridedBufferRegionKHR* pMissShaderBindingTable, + const VkStridedBufferRegionKHR* pHitShaderBindingTable, + const VkStridedBufferRegionKHR* pCallableShaderBindingTable, + VkBuffer buffer, + VkDeviceSize offset) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR VkResult VKAPI_CALL GetDeviceAccelerationStructureCompatibilityKHR( + VkDevice device, + const VkAccelerationStructureVersionKHR* version) +{ +//Not a CREATE or DESTROY function + return VK_SUCCESS; +} +#endif /* VK_ENABLE_BETA_EXTENSIONS */ diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 2960ad0..c68693d 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -79,7 +79,7 @@ static const std::unordered_map instance_extension_map = {"VK_FUCHSIA_imagepipe_surface", 1}, {"VK_EXT_metal_surface", 1}, {"VK_KHR_surface_protected_capabilities", 1}, - {"VK_EXT_validation_features", 2}, + {"VK_EXT_validation_features", 3}, {"VK_EXT_headless_surface", 1}, }; // Map of device extension name to version @@ -131,7 +131,6 @@ static const std::unordered_map device_extension_map = { {"VK_KHR_16bit_storage", 1}, {"VK_KHR_incremental_present", 1}, {"VK_KHR_descriptor_update_template", 1}, - {"VK_NVX_device_generated_commands", 3}, {"VK_NV_clip_space_w_scaling", 1}, {"VK_EXT_display_control", 1}, {"VK_GOOGLE_display_timing", 1}, @@ -170,6 +169,7 @@ static const std::unordered_map device_extension_map = { {"VK_KHR_image_format_list", 1}, {"VK_EXT_blend_operation_advanced", 2}, {"VK_NV_fragment_coverage_to_color", 1}, + {"VK_KHR_ray_tracing", 8}, {"VK_NV_framebuffer_mixed_samples", 1}, {"VK_NV_fill_rectangle", 1}, {"VK_NV_shader_sm_builtins", 1}, @@ -212,7 +212,7 @@ static const std::unordered_map device_extension_map = { {"VK_NV_device_diagnostic_checkpoints", 2}, {"VK_KHR_timeline_semaphore", 2}, {"VK_INTEL_shader_integer_functions2", 1}, - {"VK_INTEL_performance_query", 1}, + {"VK_INTEL_performance_query", 2}, {"VK_KHR_vulkan_memory_model", 3}, {"VK_EXT_pci_bus_info", 2}, {"VK_AMD_display_native_hdr", 1}, @@ -241,11 +241,17 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_line_rasterization", 1}, {"VK_EXT_host_query_reset", 1}, {"VK_EXT_index_type_uint8", 1}, + {"VK_KHR_deferred_host_operations", 2}, {"VK_KHR_pipeline_executable_properties", 1}, {"VK_EXT_shader_demote_to_helper_invocation", 1}, + {"VK_NV_device_generated_commands", 3}, {"VK_EXT_texel_buffer_alignment", 1}, + {"VK_QCOM_render_pass_transform", 1}, {"VK_GOOGLE_user_type", 1}, + {"VK_KHR_pipeline_library", 1}, {"VK_KHR_shader_non_semantic_info", 1}, + {"VK_EXT_pipeline_creation_cache_control", 2}, + {"VK_NV_device_diagnostics_config", 1}, }; @@ -1852,6 +1858,31 @@ static VKAPI_ATTR uint64_t VKAPI_CALL GetDeviceMemoryOpaqueCaptureAddressKHR( VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo* pInfo); +#ifdef VK_ENABLE_BETA_EXTENSIONS + +static VKAPI_ATTR VkResult VKAPI_CALL CreateDeferredOperationKHR( + VkDevice device, + const VkAllocationCallbacks* pAllocator, + VkDeferredOperationKHR* pDeferredOperation); + +static VKAPI_ATTR void VKAPI_CALL DestroyDeferredOperationKHR( + VkDevice device, + VkDeferredOperationKHR operation, + const VkAllocationCallbacks* pAllocator); + +static VKAPI_ATTR uint32_t VKAPI_CALL GetDeferredOperationMaxConcurrencyKHR( + VkDevice device, + VkDeferredOperationKHR operation); + +static VKAPI_ATTR VkResult VKAPI_CALL GetDeferredOperationResultKHR( + VkDevice device, + VkDeferredOperationKHR operation); + +static VKAPI_ATTR VkResult VKAPI_CALL DeferredOperationJoinKHR( + VkDevice device, + VkDeferredOperationKHR operation); +#endif /* VK_ENABLE_BETA_EXTENSIONS */ + static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutablePropertiesKHR( VkDevice device, @@ -1871,6 +1902,9 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetPipelineExecutableInternalRepresentatio uint32_t* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations); +#ifdef VK_ENABLE_BETA_EXTENSIONS +#endif /* VK_ENABLE_BETA_EXTENSIONS */ + static VKAPI_ATTR VkResult VKAPI_CALL CreateDebugReportCallbackEXT( @@ -2063,56 +2097,6 @@ static VKAPI_ATTR void VKAPI_CALL CmdEndConditionalRenderingEXT( VkCommandBuffer commandBuffer); -static VKAPI_ATTR void VKAPI_CALL CmdProcessCommandsNVX( - VkCommandBuffer commandBuffer, - const VkCmdProcessCommandsInfoNVX* pProcessCommandsInfo); - -static VKAPI_ATTR void VKAPI_CALL CmdReserveSpaceForCommandsNVX( - VkCommandBuffer commandBuffer, - const VkCmdReserveSpaceForCommandsInfoNVX* pReserveSpaceInfo); - -static VKAPI_ATTR VkResult VKAPI_CALL CreateIndirectCommandsLayoutNVX( - VkDevice device, - const VkIndirectCommandsLayoutCreateInfoNVX* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - VkIndirectCommandsLayoutNVX* pIndirectCommandsLayout); - -static VKAPI_ATTR void VKAPI_CALL DestroyIndirectCommandsLayoutNVX( - VkDevice device, - VkIndirectCommandsLayoutNVX indirectCommandsLayout, - const VkAllocationCallbacks* pAllocator); - -static VKAPI_ATTR VkResult VKAPI_CALL CreateObjectTableNVX( - VkDevice device, - const VkObjectTableCreateInfoNVX* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - VkObjectTableNVX* pObjectTable); - -static VKAPI_ATTR void VKAPI_CALL DestroyObjectTableNVX( - VkDevice device, - VkObjectTableNVX objectTable, - const VkAllocationCallbacks* pAllocator); - -static VKAPI_ATTR VkResult VKAPI_CALL RegisterObjectsNVX( - VkDevice device, - VkObjectTableNVX objectTable, - uint32_t objectCount, - const VkObjectTableEntryNVX* const* ppObjectTableEntries, - const uint32_t* pObjectIndices); - -static VKAPI_ATTR VkResult VKAPI_CALL UnregisterObjectsNVX( - VkDevice device, - VkObjectTableNVX objectTable, - uint32_t objectCount, - const VkObjectEntryTypeNVX* pObjectEntryTypes, - const uint32_t* pObjectIndices); - -static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceGeneratedCommandsPropertiesNVX( - VkPhysicalDevice physicalDevice, - VkDeviceGeneratedCommandsFeaturesNVX* pFeatures, - VkDeviceGeneratedCommandsLimitsNVX* pLimits); - - static VKAPI_ATTR void VKAPI_CALL CmdSetViewportWScalingNV( VkCommandBuffer commandBuffer, uint32_t firstViewport, @@ -2363,9 +2347,14 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureNV( const VkAllocationCallbacks* pAllocator, VkAccelerationStructureNV* pAccelerationStructure); +static VKAPI_ATTR void VKAPI_CALL DestroyAccelerationStructureKHR( + VkDevice device, + VkAccelerationStructureKHR accelerationStructure, + const VkAllocationCallbacks* pAllocator); + static VKAPI_ATTR void VKAPI_CALL DestroyAccelerationStructureNV( VkDevice device, - VkAccelerationStructureNV accelerationStructure, + VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks* pAllocator); static VKAPI_ATTR void VKAPI_CALL GetAccelerationStructureMemoryRequirementsNV( @@ -2373,10 +2362,15 @@ static VKAPI_ATTR void VKAPI_CALL GetAccelerationStructureMemoryRequirementsNV( const VkAccelerationStructureMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2KHR* pMemoryRequirements); +static VKAPI_ATTR VkResult VKAPI_CALL BindAccelerationStructureMemoryKHR( + VkDevice device, + uint32_t bindInfoCount, + const VkBindAccelerationStructureMemoryInfoKHR* pBindInfos); + static VKAPI_ATTR VkResult VKAPI_CALL BindAccelerationStructureMemoryNV( VkDevice device, uint32_t bindInfoCount, - const VkBindAccelerationStructureMemoryInfoNV* pBindInfos); + const VkBindAccelerationStructureMemoryInfoKHR* pBindInfos); static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureNV( VkCommandBuffer commandBuffer, @@ -2384,16 +2378,16 @@ static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureNV( VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, - VkAccelerationStructureNV dst, - VkAccelerationStructureNV src, + VkAccelerationStructureKHR dst, + VkAccelerationStructureKHR src, VkBuffer scratch, VkDeviceSize scratchOffset); static VKAPI_ATTR void VKAPI_CALL CmdCopyAccelerationStructureNV( VkCommandBuffer commandBuffer, - VkAccelerationStructureNV dst, - VkAccelerationStructureNV src, - VkCopyAccelerationStructureModeNV mode); + VkAccelerationStructureKHR dst, + VkAccelerationStructureKHR src, + VkCopyAccelerationStructureModeKHR mode); static VKAPI_ATTR void VKAPI_CALL CmdTraceRaysNV( VkCommandBuffer commandBuffer, @@ -2420,6 +2414,14 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateRayTracingPipelinesNV( const VkAllocationCallbacks* pAllocator, VkPipeline* pPipelines); +static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingShaderGroupHandlesKHR( + VkDevice device, + VkPipeline pipeline, + uint32_t firstGroup, + uint32_t groupCount, + size_t dataSize, + void* pData); + static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingShaderGroupHandlesNV( VkDevice device, VkPipeline pipeline, @@ -2430,14 +2432,22 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingShaderGroupHandlesNV( static VKAPI_ATTR VkResult VKAPI_CALL GetAccelerationStructureHandleNV( VkDevice device, - VkAccelerationStructureNV accelerationStructure, + VkAccelerationStructureKHR accelerationStructure, size_t dataSize, void* pData); +static VKAPI_ATTR void VKAPI_CALL CmdWriteAccelerationStructuresPropertiesKHR( + VkCommandBuffer commandBuffer, + uint32_t accelerationStructureCount, + const VkAccelerationStructureKHR* pAccelerationStructures, + VkQueryType queryType, + VkQueryPool queryPool, + uint32_t firstQuery); + static VKAPI_ATTR void VKAPI_CALL CmdWriteAccelerationStructuresPropertiesNV( VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, - const VkAccelerationStructureNV* pAccelerationStructures, + const VkAccelerationStructureKHR* pAccelerationStructures, VkQueryType queryType, VkQueryPool queryPool, uint32_t firstQuery); @@ -2675,6 +2685,150 @@ static VKAPI_ATTR void VKAPI_CALL ResetQueryPoolEXT( +static VKAPI_ATTR void VKAPI_CALL GetGeneratedCommandsMemoryRequirementsNV( + VkDevice device, + const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +static VKAPI_ATTR void VKAPI_CALL CmdPreprocessGeneratedCommandsNV( + VkCommandBuffer commandBuffer, + const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo); + +static VKAPI_ATTR void VKAPI_CALL CmdExecuteGeneratedCommandsNV( + VkCommandBuffer commandBuffer, + VkBool32 isPreprocessed, + const VkGeneratedCommandsInfoNV* pGeneratedCommandsInfo); + +static VKAPI_ATTR void VKAPI_CALL CmdBindPipelineShaderGroupNV( + VkCommandBuffer commandBuffer, + VkPipelineBindPoint pipelineBindPoint, + VkPipeline pipeline, + uint32_t groupIndex); + +static VKAPI_ATTR VkResult VKAPI_CALL CreateIndirectCommandsLayoutNV( + VkDevice device, + const VkIndirectCommandsLayoutCreateInfoNV* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkIndirectCommandsLayoutNV* pIndirectCommandsLayout); + +static VKAPI_ATTR void VKAPI_CALL DestroyIndirectCommandsLayoutNV( + VkDevice device, + VkIndirectCommandsLayoutNV indirectCommandsLayout, + const VkAllocationCallbacks* pAllocator); + + + + + + +#ifdef VK_ENABLE_BETA_EXTENSIONS + +static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( + VkDevice device, + const VkAccelerationStructureCreateInfoKHR* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkAccelerationStructureKHR* pAccelerationStructure); + +static VKAPI_ATTR void VKAPI_CALL GetAccelerationStructureMemoryRequirementsKHR( + VkDevice device, + const VkAccelerationStructureMemoryRequirementsInfoKHR* pInfo, + VkMemoryRequirements2* pMemoryRequirements); + +static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureKHR( + VkCommandBuffer commandBuffer, + uint32_t infoCount, + const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, + const VkAccelerationStructureBuildOffsetInfoKHR* const* ppOffsetInfos); + +static VKAPI_ATTR void VKAPI_CALL CmdBuildAccelerationStructureIndirectKHR( + VkCommandBuffer commandBuffer, + const VkAccelerationStructureBuildGeometryInfoKHR* pInfo, + VkBuffer indirectBuffer, + VkDeviceSize indirectOffset, + uint32_t indirectStride); + +static VKAPI_ATTR VkResult VKAPI_CALL BuildAccelerationStructureKHR( + VkDevice device, + uint32_t infoCount, + const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, + const VkAccelerationStructureBuildOffsetInfoKHR* const* ppOffsetInfos); + +static VKAPI_ATTR VkResult VKAPI_CALL CopyAccelerationStructureKHR( + VkDevice device, + const VkCopyAccelerationStructureInfoKHR* pInfo); + +static VKAPI_ATTR VkResult VKAPI_CALL CopyAccelerationStructureToMemoryKHR( + VkDevice device, + const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo); + +static VKAPI_ATTR VkResult VKAPI_CALL CopyMemoryToAccelerationStructureKHR( + VkDevice device, + const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo); + +static VKAPI_ATTR VkResult VKAPI_CALL WriteAccelerationStructuresPropertiesKHR( + VkDevice device, + uint32_t accelerationStructureCount, + const VkAccelerationStructureKHR* pAccelerationStructures, + VkQueryType queryType, + size_t dataSize, + void* pData, + size_t stride); + +static VKAPI_ATTR void VKAPI_CALL CmdCopyAccelerationStructureKHR( + VkCommandBuffer commandBuffer, + const VkCopyAccelerationStructureInfoKHR* pInfo); + +static VKAPI_ATTR void VKAPI_CALL CmdCopyAccelerationStructureToMemoryKHR( + VkCommandBuffer commandBuffer, + const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo); + +static VKAPI_ATTR void VKAPI_CALL CmdCopyMemoryToAccelerationStructureKHR( + VkCommandBuffer commandBuffer, + const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo); + +static VKAPI_ATTR void VKAPI_CALL CmdTraceRaysKHR( + VkCommandBuffer commandBuffer, + const VkStridedBufferRegionKHR* pRaygenShaderBindingTable, + const VkStridedBufferRegionKHR* pMissShaderBindingTable, + const VkStridedBufferRegionKHR* pHitShaderBindingTable, + const VkStridedBufferRegionKHR* pCallableShaderBindingTable, + uint32_t width, + uint32_t height, + uint32_t depth); + +static VKAPI_ATTR VkResult VKAPI_CALL CreateRayTracingPipelinesKHR( + VkDevice device, + VkPipelineCache pipelineCache, + uint32_t createInfoCount, + const VkRayTracingPipelineCreateInfoKHR* pCreateInfos, + const VkAllocationCallbacks* pAllocator, + VkPipeline* pPipelines); + +static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetAccelerationStructureDeviceAddressKHR( + VkDevice device, + const VkAccelerationStructureDeviceAddressInfoKHR* pInfo); + +static VKAPI_ATTR VkResult VKAPI_CALL GetRayTracingCaptureReplayShaderGroupHandlesKHR( + VkDevice device, + VkPipeline pipeline, + uint32_t firstGroup, + uint32_t groupCount, + size_t dataSize, + void* pData); + +static VKAPI_ATTR void VKAPI_CALL CmdTraceRaysIndirectKHR( + VkCommandBuffer commandBuffer, + const VkStridedBufferRegionKHR* pRaygenShaderBindingTable, + const VkStridedBufferRegionKHR* pMissShaderBindingTable, + const VkStridedBufferRegionKHR* pHitShaderBindingTable, + const VkStridedBufferRegionKHR* pCallableShaderBindingTable, + VkBuffer buffer, + VkDeviceSize offset); + +static VKAPI_ATTR VkResult VKAPI_CALL GetDeviceAccelerationStructureCompatibilityKHR( + VkDevice device, + const VkAccelerationStructureVersionKHR* version); +#endif /* VK_ENABLE_BETA_EXTENSIONS */ // Map of all APIs to be intercepted by this layer static const std::unordered_map name_to_funcptr_map = { @@ -2980,6 +3134,21 @@ static const std::unordered_map name_to_funcptr_map = { {"vkGetBufferDeviceAddressKHR", (void*)GetBufferDeviceAddressKHR}, {"vkGetBufferOpaqueCaptureAddressKHR", (void*)GetBufferOpaqueCaptureAddressKHR}, {"vkGetDeviceMemoryOpaqueCaptureAddressKHR", (void*)GetDeviceMemoryOpaqueCaptureAddressKHR}, +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCreateDeferredOperationKHR", (void*)CreateDeferredOperationKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkDestroyDeferredOperationKHR", (void*)DestroyDeferredOperationKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkGetDeferredOperationMaxConcurrencyKHR", (void*)GetDeferredOperationMaxConcurrencyKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkGetDeferredOperationResultKHR", (void*)GetDeferredOperationResultKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkDeferredOperationJoinKHR", (void*)DeferredOperationJoinKHR}, +#endif {"vkGetPipelineExecutablePropertiesKHR", (void*)GetPipelineExecutablePropertiesKHR}, {"vkGetPipelineExecutableStatisticsKHR", (void*)GetPipelineExecutableStatisticsKHR}, {"vkGetPipelineExecutableInternalRepresentationsKHR", (void*)GetPipelineExecutableInternalRepresentationsKHR}, @@ -3013,15 +3182,6 @@ static const std::unordered_map name_to_funcptr_map = { #endif {"vkCmdBeginConditionalRenderingEXT", (void*)CmdBeginConditionalRenderingEXT}, {"vkCmdEndConditionalRenderingEXT", (void*)CmdEndConditionalRenderingEXT}, - {"vkCmdProcessCommandsNVX", (void*)CmdProcessCommandsNVX}, - {"vkCmdReserveSpaceForCommandsNVX", (void*)CmdReserveSpaceForCommandsNVX}, - {"vkCreateIndirectCommandsLayoutNVX", (void*)CreateIndirectCommandsLayoutNVX}, - {"vkDestroyIndirectCommandsLayoutNVX", (void*)DestroyIndirectCommandsLayoutNVX}, - {"vkCreateObjectTableNVX", (void*)CreateObjectTableNVX}, - {"vkDestroyObjectTableNVX", (void*)DestroyObjectTableNVX}, - {"vkRegisterObjectsNVX", (void*)RegisterObjectsNVX}, - {"vkUnregisterObjectsNVX", (void*)UnregisterObjectsNVX}, - {"vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX", (void*)GetPhysicalDeviceGeneratedCommandsPropertiesNVX}, {"vkCmdSetViewportWScalingNV", (void*)CmdSetViewportWScalingNV}, {"vkReleaseDisplayEXT", (void*)ReleaseDisplayEXT}, #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT @@ -3073,15 +3233,19 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCmdSetViewportShadingRatePaletteNV", (void*)CmdSetViewportShadingRatePaletteNV}, {"vkCmdSetCoarseSampleOrderNV", (void*)CmdSetCoarseSampleOrderNV}, {"vkCreateAccelerationStructureNV", (void*)CreateAccelerationStructureNV}, + {"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR}, {"vkDestroyAccelerationStructureNV", (void*)DestroyAccelerationStructureNV}, {"vkGetAccelerationStructureMemoryRequirementsNV", (void*)GetAccelerationStructureMemoryRequirementsNV}, + {"vkBindAccelerationStructureMemoryKHR", (void*)BindAccelerationStructureMemoryKHR}, {"vkBindAccelerationStructureMemoryNV", (void*)BindAccelerationStructureMemoryNV}, {"vkCmdBuildAccelerationStructureNV", (void*)CmdBuildAccelerationStructureNV}, {"vkCmdCopyAccelerationStructureNV", (void*)CmdCopyAccelerationStructureNV}, {"vkCmdTraceRaysNV", (void*)CmdTraceRaysNV}, {"vkCreateRayTracingPipelinesNV", (void*)CreateRayTracingPipelinesNV}, + {"vkGetRayTracingShaderGroupHandlesKHR", (void*)GetRayTracingShaderGroupHandlesKHR}, {"vkGetRayTracingShaderGroupHandlesNV", (void*)GetRayTracingShaderGroupHandlesNV}, {"vkGetAccelerationStructureHandleNV", (void*)GetAccelerationStructureHandleNV}, + {"vkCmdWriteAccelerationStructuresPropertiesKHR", (void*)CmdWriteAccelerationStructuresPropertiesKHR}, {"vkCmdWriteAccelerationStructuresPropertiesNV", (void*)CmdWriteAccelerationStructuresPropertiesNV}, {"vkCompileDeferredNV", (void*)CompileDeferredNV}, {"vkGetMemoryHostPointerPropertiesEXT", (void*)GetMemoryHostPointerPropertiesEXT}, @@ -3129,6 +3293,66 @@ static const std::unordered_map name_to_funcptr_map = { {"vkCreateHeadlessSurfaceEXT", (void*)CreateHeadlessSurfaceEXT}, {"vkCmdSetLineStippleEXT", (void*)CmdSetLineStippleEXT}, {"vkResetQueryPoolEXT", (void*)ResetQueryPoolEXT}, + {"vkGetGeneratedCommandsMemoryRequirementsNV", (void*)GetGeneratedCommandsMemoryRequirementsNV}, + {"vkCmdPreprocessGeneratedCommandsNV", (void*)CmdPreprocessGeneratedCommandsNV}, + {"vkCmdExecuteGeneratedCommandsNV", (void*)CmdExecuteGeneratedCommandsNV}, + {"vkCmdBindPipelineShaderGroupNV", (void*)CmdBindPipelineShaderGroupNV}, + {"vkCreateIndirectCommandsLayoutNV", (void*)CreateIndirectCommandsLayoutNV}, + {"vkDestroyIndirectCommandsLayoutNV", (void*)DestroyIndirectCommandsLayoutNV}, +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkGetAccelerationStructureMemoryRequirementsKHR", (void*)GetAccelerationStructureMemoryRequirementsKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdBuildAccelerationStructureKHR", (void*)CmdBuildAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdBuildAccelerationStructureIndirectKHR", (void*)CmdBuildAccelerationStructureIndirectKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkBuildAccelerationStructureKHR", (void*)BuildAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCopyAccelerationStructureKHR", (void*)CopyAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCopyAccelerationStructureToMemoryKHR", (void*)CopyAccelerationStructureToMemoryKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCopyMemoryToAccelerationStructureKHR", (void*)CopyMemoryToAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkWriteAccelerationStructuresPropertiesKHR", (void*)WriteAccelerationStructuresPropertiesKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdCopyAccelerationStructureKHR", (void*)CmdCopyAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdCopyAccelerationStructureToMemoryKHR", (void*)CmdCopyAccelerationStructureToMemoryKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdCopyMemoryToAccelerationStructureKHR", (void*)CmdCopyMemoryToAccelerationStructureKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdTraceRaysKHR", (void*)CmdTraceRaysKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCreateRayTracingPipelinesKHR", (void*)CreateRayTracingPipelinesKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkGetAccelerationStructureDeviceAddressKHR", (void*)GetAccelerationStructureDeviceAddressKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkGetRayTracingCaptureReplayShaderGroupHandlesKHR", (void*)GetRayTracingCaptureReplayShaderGroupHandlesKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkCmdTraceRaysIndirectKHR", (void*)CmdTraceRaysIndirectKHR}, +#endif +#ifdef VK_ENABLE_BETA_EXTENSIONS + {"vkGetDeviceAccelerationStructureCompatibilityKHR", (void*)GetDeviceAccelerationStructureCompatibilityKHR}, +#endif }; diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 5244ee7..bb419a4 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -2026,6 +2026,17 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEFERRED_OPERATION_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkDeferredOperationInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS // Map type VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR; @@ -2080,6 +2091,17 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_LIBRARY_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPipelineLibraryCreateInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS // Map type VkDebugReportCallbackCreateInfoEXT to id VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; @@ -2342,60 +2364,6 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_FEATURES_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkDeviceGeneratedCommandsFeaturesNVX Type; -}; - -// Map type VkDeviceGeneratedCommandsLimitsNVX to id VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkDeviceGeneratedCommandsLimitsNVX Type; -}; - -// Map type VkIndirectCommandsLayoutCreateInfoNVX to id VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkIndirectCommandsLayoutCreateInfoNVX Type; -}; - -// Map type VkCmdProcessCommandsInfoNVX to id VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkCmdProcessCommandsInfoNVX Type; -}; - -// Map type VkCmdReserveSpaceForCommandsInfoNVX to id VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkCmdReserveSpaceForCommandsInfoNVX Type; -}; - -// Map type VkObjectTableCreateInfoNVX to id VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX; -}; - -template <> struct LvlSTypeMap { - typedef VkObjectTableCreateInfoNVX Type; -}; - // Map type VkPipelineViewportWScalingStateCreateInfoNV to id VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV; @@ -2979,22 +2947,22 @@ template <> struct LvlSTypeMap struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV; +// Map type VkBindAccelerationStructureMemoryInfoKHR to id VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_KHR; }; -template <> struct LvlSTypeMap { - typedef VkBindAccelerationStructureMemoryInfoNV Type; +template <> struct LvlSTypeMap { + typedef VkBindAccelerationStructureMemoryInfoKHR Type; }; -// Map type VkWriteDescriptorSetAccelerationStructureNV to id VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV -template <> struct LvlTypeMap { - static const VkStructureType kSType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV; +// Map type VkWriteDescriptorSetAccelerationStructureKHR to id VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR; }; -template <> struct LvlSTypeMap { - typedef VkWriteDescriptorSetAccelerationStructureNV Type; +template <> struct LvlSTypeMap { + typedef VkWriteDescriptorSetAccelerationStructureKHR Type; }; // Map type VkAccelerationStructureMemoryRequirementsInfoNV to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV @@ -3269,13 +3237,13 @@ template <> struct LvlSTypeMap struct LvlTypeMap { +// Map type VkQueryPoolPerformanceQueryCreateInfoINTEL to id VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL +template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO_INTEL; }; template <> struct LvlSTypeMap { - typedef VkQueryPoolCreateInfoINTEL Type; + typedef VkQueryPoolPerformanceQueryCreateInfoINTEL Type; }; // Map type VkPerformanceMarkerInfoINTEL to id VK_STRUCTURE_TYPE_PERFORMANCE_MARKER_INFO_INTEL @@ -3666,6 +3634,78 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_PROPERTIES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceDeviceGeneratedCommandsPropertiesNV Type; +}; + +// Map type VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceDeviceGeneratedCommandsFeaturesNV Type; +}; + +// Map type VkGraphicsShaderGroupCreateInfoNV to id VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_GRAPHICS_SHADER_GROUP_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkGraphicsShaderGroupCreateInfoNV Type; +}; + +// Map type VkGraphicsPipelineShaderGroupsCreateInfoNV to id VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_SHADER_GROUPS_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkGraphicsPipelineShaderGroupsCreateInfoNV Type; +}; + +// Map type VkIndirectCommandsLayoutTokenNV to id VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_TOKEN_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkIndirectCommandsLayoutTokenNV Type; +}; + +// Map type VkIndirectCommandsLayoutCreateInfoNV to id VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkIndirectCommandsLayoutCreateInfoNV Type; +}; + +// Map type VkGeneratedCommandsInfoNV to id VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_GENERATED_COMMANDS_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkGeneratedCommandsInfoNV Type; +}; + +// Map type VkGeneratedCommandsMemoryRequirementsInfoNV to id VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_GENERATED_COMMANDS_MEMORY_REQUIREMENTS_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkGeneratedCommandsMemoryRequirementsInfoNV Type; +}; + // Map type VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT; @@ -3684,6 +3724,249 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkRenderPassTransformBeginInfoQCOM Type; +}; + +// Map type VkCommandBufferInheritanceRenderPassTransformInfoQCOM to id VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkCommandBufferInheritanceRenderPassTransformInfoQCOM Type; +}; + +// Map type VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT Type; +}; + +// Map type VkPhysicalDeviceDiagnosticsConfigFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceDiagnosticsConfigFeaturesNV Type; +}; + +// Map type VkDeviceDiagnosticsConfigCreateInfoNV to id VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkDeviceDiagnosticsConfigCreateInfoNV Type; +}; + +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkRayTracingShaderGroupCreateInfoKHR to id VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkRayTracingShaderGroupCreateInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkRayTracingPipelineInterfaceCreateInfoKHR to id VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_INTERFACE_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkRayTracingPipelineInterfaceCreateInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkRayTracingPipelineCreateInfoKHR to id VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkRayTracingPipelineCreateInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureGeometryTrianglesDataKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureGeometryAabbsDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_AABBS_DATA_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureGeometryAabbsDataKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureGeometryInstancesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_INSTANCES_DATA_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureGeometryInstancesDataKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureGeometryKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureGeometryKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureBuildGeometryInfoKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureBuildGeometryInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureCreateGeometryTypeInfoKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_GEOMETRY_TYPE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_GEOMETRY_TYPE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureCreateGeometryTypeInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureCreateInfoKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureCreateInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureMemoryRequirementsInfoKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureMemoryRequirementsInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkPhysicalDeviceRayTracingFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_FEATURES_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_FEATURES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceRayTracingFeaturesKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkPhysicalDeviceRayTracingPropertiesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceRayTracingPropertiesKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureDeviceAddressInfoKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureDeviceAddressInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkAccelerationStructureVersionKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_VERSION_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_VERSION_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkAccelerationStructureVersionKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkCopyAccelerationStructureToMemoryInfoKHR to id VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_TO_MEMORY_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkCopyAccelerationStructureToMemoryInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkCopyMemoryToAccelerationStructureInfoKHR to id VK_STRUCTURE_TYPE_COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_COPY_MEMORY_TO_ACCELERATION_STRUCTURE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkCopyMemoryToAccelerationStructureInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +// Map type VkCopyAccelerationStructureInfoKHR to id VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_INFO_KHR +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_COPY_ACCELERATION_STRUCTURE_INFO_KHR; +}; + +template <> struct LvlSTypeMap { + typedef VkCopyAccelerationStructureInfoKHR Type; +}; + +#endif // VK_ENABLE_BETA_EXTENSIONS // Header "base class" for pNext chain traversal struct LvlGenericHeader { VkStructureType sType; diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py index d56ebac..11b4fe5 100644 --- a/scripts/common_codegen.py +++ b/scripts/common_codegen.py @@ -57,6 +57,7 @@ platform_dict = { 'xcb' : 'VK_USE_PLATFORM_XCB_KHR', 'xlib' : 'VK_USE_PLATFORM_XLIB_KHR', 'xlib_xrandr' : 'VK_USE_PLATFORM_XLIB_XRANDR_EXT', + 'provisional' : 'VK_ENABLE_BETA_EXTENSIONS', } # diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 908f66c..a030052 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -267,6 +267,22 @@ VK_core_1 = Extension(name='VK_core_1', version=1, guard=None, commands=[ Command(name='vkGetDescriptorSetLayoutSupport', dispatch='VkDevice'), ]) +VK_core_2 = Extension(name='VK_core_2', version=2, guard=None, commands=[ + Command(name='vkCmdDrawIndirectCount', dispatch='VkCommandBuffer'), + Command(name='vkCmdDrawIndexedIndirectCount', dispatch='VkCommandBuffer'), + Command(name='vkCreateRenderPass2', dispatch='VkDevice'), + Command(name='vkCmdBeginRenderPass2', dispatch='VkCommandBuffer'), + Command(name='vkCmdNextSubpass2', dispatch='VkCommandBuffer'), + Command(name='vkCmdEndRenderPass2', dispatch='VkCommandBuffer'), + Command(name='vkResetQueryPool', dispatch='VkDevice'), + Command(name='vkGetSemaphoreCounterValue', dispatch='VkDevice'), + Command(name='vkWaitSemaphores', dispatch='VkDevice'), + Command(name='vkSignalSemaphore', dispatch='VkDevice'), + Command(name='vkGetBufferDeviceAddress', dispatch='VkDevice'), + Command(name='vkGetBufferOpaqueCaptureAddress', dispatch='VkDevice'), + Command(name='vkGetDeviceMemoryOpaqueCaptureAddress', dispatch='VkDevice'), +]) + VK_KHR_surface = Extension(name='VK_KHR_surface', version=25, guard=None, commands=[ Command(name='vkDestroySurfaceKHR', dispatch='VkInstance'), Command(name='vkGetPhysicalDeviceSurfaceSupportKHR', dispatch='VkPhysicalDevice'), @@ -287,7 +303,7 @@ VK_KHR_swapchain = Extension(name='VK_KHR_swapchain', version=70, guard=None, co Command(name='vkAcquireNextImage2KHR', dispatch='VkDevice'), ]) -VK_KHR_display = Extension(name='VK_KHR_display', version=21, guard=None, commands=[ +VK_KHR_display = Extension(name='VK_KHR_display', version=23, guard=None, commands=[ Command(name='vkGetPhysicalDeviceDisplayPropertiesKHR', dispatch='VkPhysicalDevice'), Command(name='vkGetPhysicalDeviceDisplayPlanePropertiesKHR', dispatch='VkPhysicalDevice'), Command(name='vkGetDisplayPlaneSupportedDisplaysKHR', dispatch='VkPhysicalDevice'), @@ -297,17 +313,17 @@ VK_KHR_display = Extension(name='VK_KHR_display', version=21, guard=None, comman Command(name='vkCreateDisplayPlaneSurfaceKHR', dispatch='VkInstance'), ]) -VK_KHR_display_swapchain = Extension(name='VK_KHR_display_swapchain', version=9, guard=None, commands=[ +VK_KHR_display_swapchain = Extension(name='VK_KHR_display_swapchain', version=10, guard=None, commands=[ Command(name='vkCreateSharedSwapchainsKHR', dispatch='VkDevice'), ]) -VK_KHR_sampler_mirror_clamp_to_edge = Extension(name='VK_KHR_sampler_mirror_clamp_to_edge', version=1, guard=None, commands=[ +VK_KHR_sampler_mirror_clamp_to_edge = Extension(name='VK_KHR_sampler_mirror_clamp_to_edge', version=3, guard=None, commands=[ ]) VK_KHR_multiview = Extension(name='VK_KHR_multiview', version=1, guard=None, commands=[ ]) -VK_KHR_get_physical_device_properties2 = Extension(name='VK_KHR_get_physical_device_properties2', version=1, guard=None, commands=[ +VK_KHR_get_physical_device_properties2 = Extension(name='VK_KHR_get_physical_device_properties2', version=2, guard=None, commands=[ Command(name='vkGetPhysicalDeviceFeatures2KHR', dispatch='VkPhysicalDevice'), Command(name='vkGetPhysicalDeviceProperties2KHR', dispatch='VkPhysicalDevice'), Command(name='vkGetPhysicalDeviceFormatProperties2KHR', dispatch='VkPhysicalDevice'), @@ -317,7 +333,7 @@ VK_KHR_get_physical_device_properties2 = Extension(name='VK_KHR_get_physical_dev Command(name='vkGetPhysicalDeviceSparseImageFormatProperties2KHR', dispatch='VkPhysicalDevice'), ]) -VK_KHR_device_group = Extension(name='VK_KHR_device_group', version=3, guard=None, commands=[ +VK_KHR_device_group = Extension(name='VK_KHR_device_group', version=4, guard=None, commands=[ Command(name='vkGetDeviceGroupPeerMemoryFeaturesKHR', dispatch='VkDevice'), Command(name='vkCmdSetDeviceMaskKHR', dispatch='VkCommandBuffer'), Command(name='vkCmdDispatchBaseKHR', dispatch='VkCommandBuffer'), @@ -363,6 +379,9 @@ VK_KHR_push_descriptor = Extension(name='VK_KHR_push_descriptor', version=2, gua Command(name='vkCmdPushDescriptorSetWithTemplateKHR', dispatch='VkCommandBuffer'), ]) +VK_KHR_shader_float16_int8 = Extension(name='VK_KHR_shader_float16_int8', version=1, guard=None, commands=[ +]) + VK_KHR_16bit_storage = Extension(name='VK_KHR_16bit_storage', version=1, guard=None, commands=[ ]) @@ -375,6 +394,9 @@ VK_KHR_descriptor_update_template = Extension(name='VK_KHR_descriptor_update_tem Command(name='vkUpdateDescriptorSetWithTemplateKHR', dispatch='VkDevice'), ]) +VK_KHR_imageless_framebuffer = Extension(name='VK_KHR_imageless_framebuffer', version=1, guard=None, commands=[ +]) + VK_KHR_create_renderpass2 = Extension(name='VK_KHR_create_renderpass2', version=1, guard=None, commands=[ Command(name='vkCreateRenderPass2KHR', dispatch='VkDevice'), Command(name='vkCmdBeginRenderPass2KHR', dispatch='VkCommandBuffer'), @@ -398,6 +420,13 @@ VK_KHR_external_fence_fd = Extension(name='VK_KHR_external_fence_fd', version=1, Command(name='vkGetFenceFdKHR', dispatch='VkDevice'), ]) +VK_KHR_performance_query = Extension(name='VK_KHR_performance_query', version=1, guard=None, commands=[ + Command(name='vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR', dispatch='VkPhysicalDevice'), + Command(name='vkGetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR', dispatch='VkPhysicalDevice'), + Command(name='vkAcquireProfilingLockKHR', dispatch='VkDevice'), + Command(name='vkReleaseProfilingLockKHR', dispatch='VkDevice'), +]) + VK_KHR_maintenance2 = Extension(name='VK_KHR_maintenance2', version=1, guard=None, commands=[ ]) @@ -434,7 +463,7 @@ VK_KHR_get_memory_requirements2 = Extension(name='VK_KHR_get_memory_requirements VK_KHR_image_format_list = Extension(name='VK_KHR_image_format_list', version=1, guard=None, commands=[ ]) -VK_KHR_sampler_ycbcr_conversion = Extension(name='VK_KHR_sampler_ycbcr_conversion', version=1, guard=None, commands=[ +VK_KHR_sampler_ycbcr_conversion = Extension(name='VK_KHR_sampler_ycbcr_conversion', version=14, guard=None, commands=[ Command(name='vkCreateSamplerYcbcrConversionKHR', dispatch='VkDevice'), Command(name='vkDestroySamplerYcbcrConversionKHR', dispatch='VkDevice'), ]) @@ -453,16 +482,64 @@ VK_KHR_draw_indirect_count = Extension(name='VK_KHR_draw_indirect_count', versio Command(name='vkCmdDrawIndexedIndirectCountKHR', dispatch='VkCommandBuffer'), ]) +VK_KHR_shader_subgroup_extended_types = Extension(name='VK_KHR_shader_subgroup_extended_types', version=1, guard=None, commands=[ +]) + VK_KHR_8bit_storage = Extension(name='VK_KHR_8bit_storage', version=1, guard=None, commands=[ ]) VK_KHR_shader_atomic_int64 = Extension(name='VK_KHR_shader_atomic_int64', version=1, guard=None, commands=[ ]) +VK_KHR_shader_clock = Extension(name='VK_KHR_shader_clock', version=1, guard=None, commands=[ +]) + VK_KHR_driver_properties = Extension(name='VK_KHR_driver_properties', version=1, guard=None, commands=[ ]) -VK_KHR_vulkan_memory_model = Extension(name='VK_KHR_vulkan_memory_model', version=2, guard=None, commands=[ +VK_KHR_shader_float_controls = Extension(name='VK_KHR_shader_float_controls', version=4, guard=None, commands=[ +]) + +VK_KHR_depth_stencil_resolve = Extension(name='VK_KHR_depth_stencil_resolve', version=1, guard=None, commands=[ +]) + +VK_KHR_swapchain_mutable_format = Extension(name='VK_KHR_swapchain_mutable_format', version=1, guard=None, commands=[ +]) + +VK_KHR_timeline_semaphore = Extension(name='VK_KHR_timeline_semaphore', version=2, guard=None, commands=[ + Command(name='vkGetSemaphoreCounterValueKHR', dispatch='VkDevice'), + Command(name='vkWaitSemaphoresKHR', dispatch='VkDevice'), + Command(name='vkSignalSemaphoreKHR', dispatch='VkDevice'), +]) + +VK_KHR_vulkan_memory_model = Extension(name='VK_KHR_vulkan_memory_model', version=3, guard=None, commands=[ +]) + +VK_KHR_spirv_1_4 = Extension(name='VK_KHR_spirv_1_4', version=1, guard=None, commands=[ +]) + +VK_KHR_surface_protected_capabilities = Extension(name='VK_KHR_surface_protected_capabilities', version=1, guard=None, commands=[ +]) + +VK_KHR_separate_depth_stencil_layouts = Extension(name='VK_KHR_separate_depth_stencil_layouts', version=1, guard=None, commands=[ +]) + +VK_KHR_uniform_buffer_standard_layout = Extension(name='VK_KHR_uniform_buffer_standard_layout', version=1, guard=None, commands=[ +]) + +VK_KHR_buffer_device_address = Extension(name='VK_KHR_buffer_device_address', version=1, guard=None, commands=[ + Command(name='vkGetBufferDeviceAddressKHR', dispatch='VkDevice'), + Command(name='vkGetBufferOpaqueCaptureAddressKHR', dispatch='VkDevice'), + Command(name='vkGetDeviceMemoryOpaqueCaptureAddressKHR', dispatch='VkDevice'), +]) + +VK_KHR_pipeline_executable_properties = Extension(name='VK_KHR_pipeline_executable_properties', version=1, guard=None, commands=[ + Command(name='vkGetPipelineExecutablePropertiesKHR', dispatch='VkDevice'), + Command(name='vkGetPipelineExecutableStatisticsKHR', dispatch='VkDevice'), + Command(name='vkGetPipelineExecutableInternalRepresentationsKHR', dispatch='VkDevice'), +]) + +VK_KHR_shader_non_semantic_info = Extension(name='VK_KHR_shader_non_semantic_info', version=1, guard=None, commands=[ ]) VK_EXT_debug_report = Extension(name='VK_EXT_debug_report', version=9, guard=None, commands=[ @@ -512,7 +589,11 @@ VK_EXT_transform_feedback = Extension(name='VK_EXT_transform_feedback', version= Command(name='vkCmdDrawIndirectByteCountEXT', dispatch='VkCommandBuffer'), ]) -VK_AMD_draw_indirect_count = Extension(name='VK_AMD_draw_indirect_count', version=1, guard=None, commands=[ +VK_NVX_image_view_handle = Extension(name='VK_NVX_image_view_handle', version=1, guard=None, commands=[ + Command(name='vkGetImageViewHandleNVX', dispatch='VkDevice'), +]) + +VK_AMD_draw_indirect_count = Extension(name='VK_AMD_draw_indirect_count', version=2, guard=None, commands=[ Command(name='vkCmdDrawIndirectCountAMD', dispatch='VkCommandBuffer'), Command(name='vkCmdDrawIndexedIndirectCountAMD', dispatch='VkCommandBuffer'), ]) @@ -520,7 +601,7 @@ VK_AMD_draw_indirect_count = Extension(name='VK_AMD_draw_indirect_count', versio VK_AMD_negative_viewport_height = Extension(name='VK_AMD_negative_viewport_height', version=1, guard=None, commands=[ ]) -VK_AMD_gpu_shader_half_float = Extension(name='VK_AMD_gpu_shader_half_float', version=1, guard=None, commands=[ +VK_AMD_gpu_shader_half_float = Extension(name='VK_AMD_gpu_shader_half_float', version=2, guard=None, commands=[ ]) VK_AMD_shader_ballot = Extension(name='VK_AMD_shader_ballot', version=1, guard=None, commands=[ @@ -549,7 +630,7 @@ VK_NV_external_memory_capabilities = Extension(name='VK_NV_external_memory_capab VK_NV_external_memory = Extension(name='VK_NV_external_memory', version=1, guard=None, commands=[ ]) -VK_EXT_validation_flags = Extension(name='VK_EXT_validation_flags', version=1, guard=None, commands=[ +VK_EXT_validation_flags = Extension(name='VK_EXT_validation_flags', version=2, guard=None, commands=[ ]) VK_EXT_shader_subgroup_ballot = Extension(name='VK_EXT_shader_subgroup_ballot', version=1, guard=None, commands=[ @@ -558,26 +639,17 @@ VK_EXT_shader_subgroup_ballot = Extension(name='VK_EXT_shader_subgroup_ballot', VK_EXT_shader_subgroup_vote = Extension(name='VK_EXT_shader_subgroup_vote', version=1, guard=None, commands=[ ]) +VK_EXT_texture_compression_astc_hdr = Extension(name='VK_EXT_texture_compression_astc_hdr', version=1, guard=None, commands=[ +]) + VK_EXT_astc_decode_mode = Extension(name='VK_EXT_astc_decode_mode', version=1, guard=None, commands=[ ]) -VK_EXT_conditional_rendering = Extension(name='VK_EXT_conditional_rendering', version=1, guard=None, commands=[ +VK_EXT_conditional_rendering = Extension(name='VK_EXT_conditional_rendering', version=2, guard=None, commands=[ Command(name='vkCmdBeginConditionalRenderingEXT', dispatch='VkCommandBuffer'), Command(name='vkCmdEndConditionalRenderingEXT', dispatch='VkCommandBuffer'), ]) -VK_NVX_device_generated_commands = Extension(name='VK_NVX_device_generated_commands', version=3, guard=None, commands=[ - Command(name='vkCmdProcessCommandsNVX', dispatch='VkCommandBuffer'), - Command(name='vkCmdReserveSpaceForCommandsNVX', dispatch='VkCommandBuffer'), - Command(name='vkCreateIndirectCommandsLayoutNVX', dispatch='VkDevice'), - Command(name='vkDestroyIndirectCommandsLayoutNVX', dispatch='VkDevice'), - Command(name='vkCreateObjectTableNVX', dispatch='VkDevice'), - Command(name='vkDestroyObjectTableNVX', dispatch='VkDevice'), - Command(name='vkRegisterObjectsNVX', dispatch='VkDevice'), - Command(name='vkUnregisterObjectsNVX', dispatch='VkDevice'), - Command(name='vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX', dispatch='VkPhysicalDevice'), -]) - VK_NV_clip_space_w_scaling = Extension(name='VK_NV_clip_space_w_scaling', version=1, guard=None, commands=[ Command(name='vkCmdSetViewportWScalingNV', dispatch='VkCommandBuffer'), ]) @@ -624,10 +696,13 @@ VK_EXT_discard_rectangles = Extension(name='VK_EXT_discard_rectangles', version= VK_EXT_conservative_rasterization = Extension(name='VK_EXT_conservative_rasterization', version=1, guard=None, commands=[ ]) -VK_EXT_swapchain_colorspace = Extension(name='VK_EXT_swapchain_colorspace', version=3, guard=None, commands=[ +VK_EXT_depth_clip_enable = Extension(name='VK_EXT_depth_clip_enable', version=1, guard=None, commands=[ +]) + +VK_EXT_swapchain_colorspace = Extension(name='VK_EXT_swapchain_colorspace', version=4, guard=None, commands=[ ]) -VK_EXT_hdr_metadata = Extension(name='VK_EXT_hdr_metadata', version=1, guard=None, commands=[ +VK_EXT_hdr_metadata = Extension(name='VK_EXT_hdr_metadata', version=2, guard=None, commands=[ Command(name='vkSetHdrMetadataEXT', dispatch='VkDevice'), ]) @@ -651,10 +726,10 @@ VK_EXT_debug_utils = Extension(name='VK_EXT_debug_utils', version=1, guard=None, Command(name='vkSubmitDebugUtilsMessageEXT', dispatch='VkInstance'), ]) -VK_EXT_sampler_filter_minmax = Extension(name='VK_EXT_sampler_filter_minmax', version=1, guard=None, commands=[ +VK_EXT_sampler_filter_minmax = Extension(name='VK_EXT_sampler_filter_minmax', version=2, guard=None, commands=[ ]) -VK_AMD_gpu_shader_int16 = Extension(name='VK_AMD_gpu_shader_int16', version=1, guard=None, commands=[ +VK_AMD_gpu_shader_int16 = Extension(name='VK_AMD_gpu_shader_int16', version=2, guard=None, commands=[ ]) VK_AMD_mixed_attachment_samples = Extension(name='VK_AMD_mixed_attachment_samples', version=1, guard=None, commands=[ @@ -686,10 +761,10 @@ VK_NV_framebuffer_mixed_samples = Extension(name='VK_NV_framebuffer_mixed_sample VK_NV_fill_rectangle = Extension(name='VK_NV_fill_rectangle', version=1, guard=None, commands=[ ]) -VK_EXT_post_depth_coverage = Extension(name='VK_EXT_post_depth_coverage', version=1, guard=None, commands=[ +VK_NV_shader_sm_builtins = Extension(name='VK_NV_shader_sm_builtins', version=1, guard=None, commands=[ ]) -VK_EXT_extension_159 = Extension(name='VK_EXT_extension_159', version=0, guard=None, commands=[ +VK_EXT_post_depth_coverage = Extension(name='VK_EXT_post_depth_coverage', version=1, guard=None, commands=[ ]) VK_EXT_image_drm_format_modifier = Extension(name='VK_EXT_image_drm_format_modifier', version=1, guard=None, commands=[ @@ -715,22 +790,29 @@ VK_NV_shading_rate_image = Extension(name='VK_NV_shading_rate_image', version=3, Command(name='vkCmdSetCoarseSampleOrderNV', dispatch='VkCommandBuffer'), ]) -VK_NV_ray_tracing = Extension(name='VK_NV_ray_tracing', version=2, guard=None, commands=[ +VK_NV_ray_tracing = Extension(name='VK_NV_ray_tracing', version=3, guard=None, commands=[ Command(name='vkCreateAccelerationStructureNV', dispatch='VkDevice'), + Command(name='vkDestroyAccelerationStructureKHR', dispatch='VkDevice'), Command(name='vkDestroyAccelerationStructureNV', dispatch='VkDevice'), Command(name='vkGetAccelerationStructureMemoryRequirementsNV', dispatch='VkDevice'), + Command(name='vkBindAccelerationStructureMemoryKHR', dispatch='VkDevice'), Command(name='vkBindAccelerationStructureMemoryNV', dispatch='VkDevice'), Command(name='vkCmdBuildAccelerationStructureNV', dispatch='VkCommandBuffer'), Command(name='vkCmdCopyAccelerationStructureNV', dispatch='VkCommandBuffer'), Command(name='vkCmdTraceRaysNV', dispatch='VkCommandBuffer'), Command(name='vkCreateRayTracingPipelinesNV', dispatch='VkDevice'), + Command(name='vkGetRayTracingShaderGroupHandlesKHR', dispatch='VkDevice'), Command(name='vkGetRayTracingShaderGroupHandlesNV', dispatch='VkDevice'), Command(name='vkGetAccelerationStructureHandleNV', dispatch='VkDevice'), + Command(name='vkCmdWriteAccelerationStructuresPropertiesKHR', dispatch='VkCommandBuffer'), Command(name='vkCmdWriteAccelerationStructuresPropertiesNV', dispatch='VkCommandBuffer'), Command(name='vkCompileDeferredNV', dispatch='VkDevice'), ]) -VK_NV_representative_fragment_test = Extension(name='VK_NV_representative_fragment_test', version=1, guard=None, commands=[ +VK_NV_representative_fragment_test = Extension(name='VK_NV_representative_fragment_test', version=2, guard=None, commands=[ +]) + +VK_EXT_filter_cubic = Extension(name='VK_EXT_filter_cubic', version=3, guard=None, commands=[ ]) VK_EXT_global_priority = Extension(name='VK_EXT_global_priority', version=2, guard=None, commands=[ @@ -744,12 +826,15 @@ VK_AMD_buffer_marker = Extension(name='VK_AMD_buffer_marker', version=1, guard=N Command(name='vkCmdWriteBufferMarkerAMD', dispatch='VkCommandBuffer'), ]) +VK_AMD_pipeline_compiler_control = Extension(name='VK_AMD_pipeline_compiler_control', version=1, guard=None, commands=[ +]) + VK_EXT_calibrated_timestamps = Extension(name='VK_EXT_calibrated_timestamps', version=1, guard=None, commands=[ Command(name='vkGetPhysicalDeviceCalibrateableTimeDomainsEXT', dispatch='VkPhysicalDevice'), Command(name='vkGetCalibratedTimestampsEXT', dispatch='VkDevice'), ]) -VK_AMD_shader_core_properties = Extension(name='VK_AMD_shader_core_properties', version=1, guard=None, commands=[ +VK_AMD_shader_core_properties = Extension(name='VK_AMD_shader_core_properties', version=2, guard=None, commands=[ ]) VK_AMD_memory_overallocation_behavior = Extension(name='VK_AMD_memory_overallocation_behavior', version=1, guard=None, commands=[ @@ -758,6 +843,9 @@ VK_AMD_memory_overallocation_behavior = Extension(name='VK_AMD_memory_overalloca VK_EXT_vertex_attribute_divisor = Extension(name='VK_EXT_vertex_attribute_divisor', version=3, guard=None, commands=[ ]) +VK_EXT_pipeline_creation_feedback = Extension(name='VK_EXT_pipeline_creation_feedback', version=1, guard=None, commands=[ +]) + VK_NV_shader_subgroup_partitioned = Extension(name='VK_NV_shader_subgroup_partitioned', version=1, guard=None, commands=[ ]) @@ -773,7 +861,7 @@ VK_NV_mesh_shader = Extension(name='VK_NV_mesh_shader', version=1, guard=None, c VK_NV_fragment_shader_barycentric = Extension(name='VK_NV_fragment_shader_barycentric', version=1, guard=None, commands=[ ]) -VK_NV_shader_image_footprint = Extension(name='VK_NV_shader_image_footprint', version=1, guard=None, commands=[ +VK_NV_shader_image_footprint = Extension(name='VK_NV_shader_image_footprint', version=2, guard=None, commands=[ ]) VK_NV_scissor_exclusive = Extension(name='VK_NV_scissor_exclusive', version=1, guard=None, commands=[ @@ -785,13 +873,126 @@ VK_NV_device_diagnostic_checkpoints = Extension(name='VK_NV_device_diagnostic_ch Command(name='vkGetQueueCheckpointDataNV', dispatch='VkQueue'), ]) -VK_EXT_pci_bus_info = Extension(name='VK_EXT_pci_bus_info', version=1, guard=None, commands=[ +VK_INTEL_shader_integer_functions2 = Extension(name='VK_INTEL_shader_integer_functions2', version=1, guard=None, commands=[ +]) + +VK_INTEL_performance_query = Extension(name='VK_INTEL_performance_query', version=2, guard=None, commands=[ + Command(name='vkInitializePerformanceApiINTEL', dispatch='VkDevice'), + Command(name='vkUninitializePerformanceApiINTEL', dispatch='VkDevice'), + Command(name='vkCmdSetPerformanceMarkerINTEL', dispatch='VkCommandBuffer'), + Command(name='vkCmdSetPerformanceStreamMarkerINTEL', dispatch='VkCommandBuffer'), + Command(name='vkCmdSetPerformanceOverrideINTEL', dispatch='VkCommandBuffer'), + Command(name='vkAcquirePerformanceConfigurationINTEL', dispatch='VkDevice'), + Command(name='vkReleasePerformanceConfigurationINTEL', dispatch='VkDevice'), + Command(name='vkQueueSetPerformanceConfigurationINTEL', dispatch='VkQueue'), + Command(name='vkGetPerformanceParameterINTEL', dispatch='VkDevice'), +]) + +VK_EXT_pci_bus_info = Extension(name='VK_EXT_pci_bus_info', version=2, guard=None, commands=[ +]) + +VK_AMD_display_native_hdr = Extension(name='VK_AMD_display_native_hdr', version=1, guard=None, commands=[ + Command(name='vkSetLocalDimmingAMD', dispatch='VkDevice'), +]) + +VK_EXT_fragment_density_map = Extension(name='VK_EXT_fragment_density_map', version=1, guard=None, commands=[ +]) + +VK_EXT_scalar_block_layout = Extension(name='VK_EXT_scalar_block_layout', version=1, guard=None, commands=[ +]) + +VK_GOOGLE_hlsl_functionality1 = Extension(name='VK_GOOGLE_hlsl_functionality1', version=1, guard=None, commands=[ ]) -VK_GOOGLE_hlsl_functionality1 = Extension(name='VK_GOOGLE_hlsl_functionality1', version=0, guard=None, commands=[ +VK_GOOGLE_decorate_string = Extension(name='VK_GOOGLE_decorate_string', version=1, guard=None, commands=[ ]) -VK_GOOGLE_decorate_string = Extension(name='VK_GOOGLE_decorate_string', version=0, guard=None, commands=[ +VK_EXT_subgroup_size_control = Extension(name='VK_EXT_subgroup_size_control', version=2, guard=None, commands=[ +]) + +VK_AMD_shader_core_properties2 = Extension(name='VK_AMD_shader_core_properties2', version=1, guard=None, commands=[ +]) + +VK_AMD_device_coherent_memory = Extension(name='VK_AMD_device_coherent_memory', version=1, guard=None, commands=[ +]) + +VK_EXT_memory_budget = Extension(name='VK_EXT_memory_budget', version=1, guard=None, commands=[ +]) + +VK_EXT_memory_priority = Extension(name='VK_EXT_memory_priority', version=1, guard=None, commands=[ +]) + +VK_NV_dedicated_allocation_image_aliasing = Extension(name='VK_NV_dedicated_allocation_image_aliasing', version=1, guard=None, commands=[ +]) + +VK_EXT_buffer_device_address = Extension(name='VK_EXT_buffer_device_address', version=2, guard=None, commands=[ + Command(name='vkGetBufferDeviceAddressEXT', dispatch='VkDevice'), +]) + +VK_EXT_tooling_info = Extension(name='VK_EXT_tooling_info', version=1, guard=None, commands=[ + Command(name='vkGetPhysicalDeviceToolPropertiesEXT', dispatch='VkPhysicalDevice'), +]) + +VK_EXT_separate_stencil_usage = Extension(name='VK_EXT_separate_stencil_usage', version=1, guard=None, commands=[ +]) + +VK_EXT_validation_features = Extension(name='VK_EXT_validation_features', version=3, guard=None, commands=[ +]) + +VK_NV_cooperative_matrix = Extension(name='VK_NV_cooperative_matrix', version=1, guard=None, commands=[ + Command(name='vkGetPhysicalDeviceCooperativeMatrixPropertiesNV', dispatch='VkPhysicalDevice'), +]) + +VK_NV_coverage_reduction_mode = Extension(name='VK_NV_coverage_reduction_mode', version=1, guard=None, commands=[ + Command(name='vkGetPhysicalDeviceSupportedFramebufferMixedSamplesCombinationsNV', dispatch='VkPhysicalDevice'), +]) + +VK_EXT_fragment_shader_interlock = Extension(name='VK_EXT_fragment_shader_interlock', version=1, guard=None, commands=[ +]) + +VK_EXT_ycbcr_image_arrays = Extension(name='VK_EXT_ycbcr_image_arrays', version=1, guard=None, commands=[ +]) + +VK_EXT_headless_surface = Extension(name='VK_EXT_headless_surface', version=1, guard=None, commands=[ + Command(name='vkCreateHeadlessSurfaceEXT', dispatch='VkInstance'), +]) + +VK_EXT_line_rasterization = Extension(name='VK_EXT_line_rasterization', version=1, guard=None, commands=[ + Command(name='vkCmdSetLineStippleEXT', dispatch='VkCommandBuffer'), +]) + +VK_EXT_host_query_reset = Extension(name='VK_EXT_host_query_reset', version=1, guard=None, commands=[ + Command(name='vkResetQueryPoolEXT', dispatch='VkDevice'), +]) + +VK_EXT_index_type_uint8 = Extension(name='VK_EXT_index_type_uint8', version=1, guard=None, commands=[ +]) + +VK_EXT_shader_demote_to_helper_invocation = Extension(name='VK_EXT_shader_demote_to_helper_invocation', version=1, guard=None, commands=[ +]) + +VK_NV_device_generated_commands = Extension(name='VK_NV_device_generated_commands', version=3, guard=None, commands=[ + Command(name='vkGetGeneratedCommandsMemoryRequirementsNV', dispatch='VkDevice'), + Command(name='vkCmdPreprocessGeneratedCommandsNV', dispatch='VkCommandBuffer'), + Command(name='vkCmdExecuteGeneratedCommandsNV', dispatch='VkCommandBuffer'), + Command(name='vkCmdBindPipelineShaderGroupNV', dispatch='VkCommandBuffer'), + Command(name='vkCreateIndirectCommandsLayoutNV', dispatch='VkDevice'), + Command(name='vkDestroyIndirectCommandsLayoutNV', dispatch='VkDevice'), +]) + +VK_EXT_texel_buffer_alignment = Extension(name='VK_EXT_texel_buffer_alignment', version=1, guard=None, commands=[ +]) + +VK_QCOM_render_pass_transform = Extension(name='VK_QCOM_render_pass_transform', version=1, guard=None, commands=[ +]) + +VK_GOOGLE_user_type = Extension(name='VK_GOOGLE_user_type', version=1, guard=None, commands=[ +]) + +VK_EXT_pipeline_creation_cache_control = Extension(name='VK_EXT_pipeline_creation_cache_control', version=2, guard=None, commands=[ +]) + +VK_NV_device_diagnostics_config = Extension(name='VK_NV_device_diagnostics_config', version=1, guard=None, commands=[ ]) VK_KHR_android_surface = Extension(name='VK_KHR_android_surface', version=6, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[ @@ -815,6 +1016,10 @@ VK_MVK_macos_surface = Extension(name='VK_MVK_macos_surface', version=2, guard=' Command(name='vkCreateMacOSSurfaceMVK', dispatch='VkInstance'), ]) +VK_EXT_metal_surface = Extension(name='VK_EXT_metal_surface', version=1, guard='VK_USE_PLATFORM_METAL_EXT', commands=[ + Command(name='vkCreateMetalSurfaceEXT', dispatch='VkInstance'), +]) + VK_NN_vi_surface = Extension(name='VK_NN_vi_surface', version=1, guard='VK_USE_PLATFORM_VI_NN', commands=[ Command(name='vkCreateViSurfaceNN', dispatch='VkInstance'), ]) @@ -851,7 +1056,14 @@ VK_NV_external_memory_win32 = Extension(name='VK_NV_external_memory_win32', vers Command(name='vkGetMemoryWin32HandleNV', dispatch='VkDevice'), ]) -VK_NV_win32_keyed_mutex = Extension(name='VK_NV_win32_keyed_mutex', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[ +VK_NV_win32_keyed_mutex = Extension(name='VK_NV_win32_keyed_mutex', version=2, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[ +]) + +VK_EXT_full_screen_exclusive = Extension(name='VK_EXT_full_screen_exclusive', version=4, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[ + Command(name='vkGetPhysicalDeviceSurfacePresentModes2EXT', dispatch='VkPhysicalDevice'), + Command(name='vkAcquireFullScreenExclusiveModeEXT', dispatch='VkDevice'), + Command(name='vkReleaseFullScreenExclusiveModeEXT', dispatch='VkDevice'), + Command(name='vkGetDeviceGroupSurfacePresentModes2EXT', dispatch='VkDevice'), ]) VK_KHR_xcb_surface = Extension(name='VK_KHR_xcb_surface', version=6, guard='VK_USE_PLATFORM_XCB_KHR', commands=[ @@ -869,9 +1081,49 @@ VK_EXT_acquire_xlib_display = Extension(name='VK_EXT_acquire_xlib_display', vers Command(name='vkGetRandROutputDisplayEXT', dispatch='VkPhysicalDevice'), ]) +VK_GGP_stream_descriptor_surface = Extension(name='VK_GGP_stream_descriptor_surface', version=1, guard='VK_USE_PLATFORM_GGP', commands=[ + Command(name='vkCreateStreamDescriptorSurfaceGGP', dispatch='VkInstance'), +]) + +VK_GGP_frame_token = Extension(name='VK_GGP_frame_token', version=1, guard='VK_USE_PLATFORM_GGP', commands=[ +]) + +VK_KHR_deferred_host_operations = Extension(name='VK_KHR_deferred_host_operations', version=2, guard='VK_USE_PLATFORM_GGP', commands=[ + Command(name='vkCreateDeferredOperationKHR', dispatch='VkDevice'), + Command(name='vkDestroyDeferredOperationKHR', dispatch='VkDevice'), + Command(name='vkGetDeferredOperationMaxConcurrencyKHR', dispatch='VkDevice'), + Command(name='vkGetDeferredOperationResultKHR', dispatch='VkDevice'), + Command(name='vkDeferredOperationJoinKHR', dispatch='VkDevice'), +]) + +VK_KHR_pipeline_library = Extension(name='VK_KHR_pipeline_library', version=1, guard='VK_USE_PLATFORM_GGP', commands=[ +]) + +VK_KHR_ray_tracing = Extension(name='VK_KHR_ray_tracing', version=8, guard='VK_USE_PLATFORM_GGP', commands=[ + Command(name='vkCreateAccelerationStructureKHR', dispatch='VkDevice'), + Command(name='vkGetAccelerationStructureMemoryRequirementsKHR', dispatch='VkDevice'), + Command(name='vkCmdBuildAccelerationStructureKHR', dispatch='VkCommandBuffer'), + Command(name='vkCmdBuildAccelerationStructureIndirectKHR', dispatch='VkCommandBuffer'), + Command(name='vkBuildAccelerationStructureKHR', dispatch='VkDevice'), + Command(name='vkCopyAccelerationStructureKHR', dispatch='VkDevice'), + Command(name='vkCopyAccelerationStructureToMemoryKHR', dispatch='VkDevice'), + Command(name='vkCopyMemoryToAccelerationStructureKHR', dispatch='VkDevice'), + Command(name='vkWriteAccelerationStructuresPropertiesKHR', dispatch='VkDevice'), + Command(name='vkCmdCopyAccelerationStructureKHR', dispatch='VkCommandBuffer'), + Command(name='vkCmdCopyAccelerationStructureToMemoryKHR', dispatch='VkCommandBuffer'), + Command(name='vkCmdCopyMemoryToAccelerationStructureKHR', dispatch='VkCommandBuffer'), + Command(name='vkCmdTraceRaysKHR', dispatch='VkCommandBuffer'), + Command(name='vkCreateRayTracingPipelinesKHR', dispatch='VkDevice'), + Command(name='vkGetAccelerationStructureDeviceAddressKHR', dispatch='VkDevice'), + Command(name='vkGetRayTracingCaptureReplayShaderGroupHandlesKHR', dispatch='VkDevice'), + Command(name='vkCmdTraceRaysIndirectKHR', dispatch='VkCommandBuffer'), + Command(name='vkGetDeviceAccelerationStructureCompatibilityKHR', dispatch='VkDevice'), +]) + extensions = [ VK_core_0, VK_core_1, + VK_core_2, VK_KHR_surface, VK_KHR_swapchain, VK_KHR_display, @@ -890,14 +1142,17 @@ extensions = [ VK_KHR_external_semaphore, VK_KHR_external_semaphore_fd, VK_KHR_push_descriptor, + VK_KHR_shader_float16_int8, VK_KHR_16bit_storage, VK_KHR_incremental_present, VK_KHR_descriptor_update_template, + VK_KHR_imageless_framebuffer, VK_KHR_create_renderpass2, VK_KHR_shared_presentable_image, VK_KHR_external_fence_capabilities, VK_KHR_external_fence, VK_KHR_external_fence_fd, + VK_KHR_performance_query, VK_KHR_maintenance2, VK_KHR_get_surface_capabilities2, VK_KHR_variable_pointers, @@ -911,10 +1166,23 @@ extensions = [ VK_KHR_bind_memory2, VK_KHR_maintenance3, VK_KHR_draw_indirect_count, + VK_KHR_shader_subgroup_extended_types, VK_KHR_8bit_storage, VK_KHR_shader_atomic_int64, + VK_KHR_shader_clock, VK_KHR_driver_properties, + VK_KHR_shader_float_controls, + VK_KHR_depth_stencil_resolve, + VK_KHR_swapchain_mutable_format, + VK_KHR_timeline_semaphore, VK_KHR_vulkan_memory_model, + VK_KHR_spirv_1_4, + VK_KHR_surface_protected_capabilities, + VK_KHR_separate_depth_stencil_layouts, + VK_KHR_uniform_buffer_standard_layout, + VK_KHR_buffer_device_address, + VK_KHR_pipeline_executable_properties, + VK_KHR_shader_non_semantic_info, VK_EXT_debug_report, VK_NV_glsl_shader, VK_EXT_depth_range_unrestricted, @@ -926,6 +1194,7 @@ extensions = [ VK_AMD_gcn_shader, VK_NV_dedicated_allocation, VK_EXT_transform_feedback, + VK_NVX_image_view_handle, VK_AMD_draw_indirect_count, VK_AMD_negative_viewport_height, VK_AMD_gpu_shader_half_float, @@ -940,9 +1209,9 @@ extensions = [ VK_EXT_validation_flags, VK_EXT_shader_subgroup_ballot, VK_EXT_shader_subgroup_vote, + VK_EXT_texture_compression_astc_hdr, VK_EXT_astc_decode_mode, VK_EXT_conditional_rendering, - VK_NVX_device_generated_commands, VK_NV_clip_space_w_scaling, VK_EXT_direct_mode_display, VK_EXT_display_surface_counter, @@ -955,6 +1224,7 @@ extensions = [ VK_NV_viewport_swizzle, VK_EXT_discard_rectangles, VK_EXT_conservative_rasterization, + VK_EXT_depth_clip_enable, VK_EXT_swapchain_colorspace, VK_EXT_hdr_metadata, VK_EXT_external_memory_dma_buf, @@ -971,8 +1241,8 @@ extensions = [ VK_NV_fragment_coverage_to_color, VK_NV_framebuffer_mixed_samples, VK_NV_fill_rectangle, + VK_NV_shader_sm_builtins, VK_EXT_post_depth_coverage, - VK_EXT_extension_159, VK_EXT_image_drm_format_modifier, VK_EXT_validation_cache, VK_EXT_descriptor_indexing, @@ -980,13 +1250,16 @@ extensions = [ VK_NV_shading_rate_image, VK_NV_ray_tracing, VK_NV_representative_fragment_test, + VK_EXT_filter_cubic, VK_EXT_global_priority, VK_EXT_external_memory_host, VK_AMD_buffer_marker, + VK_AMD_pipeline_compiler_control, VK_EXT_calibrated_timestamps, VK_AMD_shader_core_properties, VK_AMD_memory_overallocation_behavior, VK_EXT_vertex_attribute_divisor, + VK_EXT_pipeline_creation_feedback, VK_NV_shader_subgroup_partitioned, VK_NV_compute_shader_derivatives, VK_NV_mesh_shader, @@ -994,14 +1267,45 @@ extensions = [ VK_NV_shader_image_footprint, VK_NV_scissor_exclusive, VK_NV_device_diagnostic_checkpoints, + VK_INTEL_shader_integer_functions2, + VK_INTEL_performance_query, VK_EXT_pci_bus_info, + VK_AMD_display_native_hdr, + VK_EXT_fragment_density_map, + VK_EXT_scalar_block_layout, VK_GOOGLE_hlsl_functionality1, VK_GOOGLE_decorate_string, + VK_EXT_subgroup_size_control, + VK_AMD_shader_core_properties2, + VK_AMD_device_coherent_memory, + VK_EXT_memory_budget, + VK_EXT_memory_priority, + VK_NV_dedicated_allocation_image_aliasing, + VK_EXT_buffer_device_address, + VK_EXT_tooling_info, + VK_EXT_separate_stencil_usage, + VK_EXT_validation_features, + VK_NV_cooperative_matrix, + VK_NV_coverage_reduction_mode, + VK_EXT_fragment_shader_interlock, + VK_EXT_ycbcr_image_arrays, + VK_EXT_headless_surface, + VK_EXT_line_rasterization, + VK_EXT_host_query_reset, + VK_EXT_index_type_uint8, + VK_EXT_shader_demote_to_helper_invocation, + VK_NV_device_generated_commands, + VK_EXT_texel_buffer_alignment, + VK_QCOM_render_pass_transform, + VK_GOOGLE_user_type, + VK_EXT_pipeline_creation_cache_control, + VK_NV_device_diagnostics_config, VK_KHR_android_surface, VK_ANDROID_external_memory_android_hardware_buffer, VK_FUCHSIA_imagepipe_surface, VK_MVK_ios_surface, VK_MVK_macos_surface, + VK_EXT_metal_surface, VK_NN_vi_surface, VK_KHR_wayland_surface, VK_KHR_win32_surface, @@ -1011,9 +1315,15 @@ extensions = [ VK_KHR_external_fence_win32, VK_NV_external_memory_win32, VK_NV_win32_keyed_mutex, + VK_EXT_full_screen_exclusive, VK_KHR_xcb_surface, VK_KHR_xlib_surface, VK_EXT_acquire_xlib_display, + VK_GGP_stream_descriptor_surface, + VK_GGP_frame_token, + VK_KHR_deferred_host_operations, + VK_KHR_pipeline_library, + VK_KHR_ray_tracing, ] # end of generated code diff --git a/scripts/known_good.json b/scripts/known_good.json index 4a3adb0..d9b808c 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -17,7 +17,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.2.133" + "commit" : "v1.2.135" }, { "name" : "MoltenVK", @@ -41,7 +41,7 @@ "sub_dir" : "Vulkan-Loader", "build_dir" : "Vulkan-Loader/build", "install_dir" : "Vulkan-Loader/build/install", - "commit" : "v1.2.133", + "commit" : "v1.2.135", "deps" : [ { "var_name" : "VULKAN_HEADERS_INSTALL_DIR", diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp index 2dc25b9..97174d6 100644 --- a/vulkaninfo/generated/vulkaninfo.hpp +++ b/vulkaninfo/generated/vulkaninfo.hpp @@ -80,9 +80,15 @@ static const char *VkResultString(VkResult value) { case (-1000003001): return "ERROR_INCOMPATIBLE_DISPLAY_KHR"; case (-1000011001): return "ERROR_VALIDATION_FAILED_EXT"; case (-1000012000): return "ERROR_INVALID_SHADER_NV"; + case (-1000150000): return "ERROR_INCOMPATIBLE_VERSION_KHR"; case (-1000158000): return "ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT"; case (-1000174001): return "ERROR_NOT_PERMITTED_EXT"; case (-1000255000): return "ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT"; + case (1000268000): return "THREAD_IDLE_KHR"; + case (1000268001): return "THREAD_DONE_KHR"; + case (1000268002): return "OPERATION_DEFERRED_KHR"; + case (1000268003): return "OPERATION_NOT_DEFERRED_KHR"; + case (1000297000): return "ERROR_PIPELINE_COMPILE_REQUIRED_EXT"; default: return "UNKNOWN_VkResult"; } } @@ -504,6 +510,7 @@ std::vectorVkFormatFeatureFlagBitsGetStrings(VkFormatFeatureFlagBi if (0x800000 & value) strings.push_back("FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT"); if (0x10000 & value) strings.push_back("FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_MINMAX_BIT"); if (0x2000 & value) strings.push_back("FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG"); + if (0x20000000 & value) strings.push_back("FORMAT_FEATURE_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR"); if (0x1000000 & value) strings.push_back("FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT"); return strings; } @@ -680,12 +687,12 @@ std::vectorVkShaderStageFlagBitsGetStrings(VkShaderStageFlagBits v if (0x20 & value) strings.push_back("SHADER_STAGE_COMPUTE_BIT"); if (0x0000001F & value) strings.push_back("SHADER_STAGE_ALL_GRAPHICS"); if (0x7FFFFFFF & value) strings.push_back("SHADER_STAGE_ALL"); - if (0x100 & value) strings.push_back("SHADER_STAGE_RAYGEN_BIT_NV"); - if (0x200 & value) strings.push_back("SHADER_STAGE_ANY_HIT_BIT_NV"); - if (0x400 & value) strings.push_back("SHADER_STAGE_CLOSEST_HIT_BIT_NV"); - if (0x800 & value) strings.push_back("SHADER_STAGE_MISS_BIT_NV"); - if (0x1000 & value) strings.push_back("SHADER_STAGE_INTERSECTION_BIT_NV"); - if (0x2000 & value) strings.push_back("SHADER_STAGE_CALLABLE_BIT_NV"); + if (0x100 & value) strings.push_back("SHADER_STAGE_RAYGEN_BIT_KHR"); + if (0x200 & value) strings.push_back("SHADER_STAGE_ANY_HIT_BIT_KHR"); + if (0x400 & value) strings.push_back("SHADER_STAGE_CLOSEST_HIT_BIT_KHR"); + if (0x800 & value) strings.push_back("SHADER_STAGE_MISS_BIT_KHR"); + if (0x1000 & value) strings.push_back("SHADER_STAGE_INTERSECTION_BIT_KHR"); + if (0x2000 & value) strings.push_back("SHADER_STAGE_CALLABLE_BIT_KHR"); if (0x40 & value) strings.push_back("SHADER_STAGE_TASK_BIT_NV"); if (0x80 & value) strings.push_back("SHADER_STAGE_MESH_BIT_NV"); return strings; @@ -1566,6 +1573,34 @@ void DumpVkPhysicalDeviceBlendOperationAdvancedPropertiesEXT(Printer &p, std::st p.PrintKeyBool("advancedBlendCorrelatedOverlap", static_cast(obj.advancedBlendCorrelatedOverlap), 37); p.PrintKeyBool("advancedBlendAllOperations", static_cast(obj.advancedBlendAllOperations), 37); } +#ifdef VK_ENABLE_BETA_EXTENSIONS +void DumpVkPhysicalDeviceRayTracingFeaturesKHR(Printer &p, std::string name, VkPhysicalDeviceRayTracingFeaturesKHR &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyBool("rayTracing", static_cast(obj.rayTracing), 45); + p.PrintKeyBool("rayTracingShaderGroupHandleCaptureReplay", static_cast(obj.rayTracingShaderGroupHandleCaptureReplay), 45); + p.PrintKeyBool("rayTracingShaderGroupHandleCaptureReplayMixed", static_cast(obj.rayTracingShaderGroupHandleCaptureReplayMixed), 45); + p.PrintKeyBool("rayTracingAccelerationStructureCaptureReplay", static_cast(obj.rayTracingAccelerationStructureCaptureReplay), 45); + p.PrintKeyBool("rayTracingIndirectTraceRays", static_cast(obj.rayTracingIndirectTraceRays), 45); + p.PrintKeyBool("rayTracingIndirectAccelerationStructureBuild", static_cast(obj.rayTracingIndirectAccelerationStructureBuild), 45); + p.PrintKeyBool("rayTracingHostAccelerationStructureCommands", static_cast(obj.rayTracingHostAccelerationStructureCommands), 45); + p.PrintKeyBool("rayQuery", static_cast(obj.rayQuery), 45); + p.PrintKeyBool("rayTracingPrimitiveCulling", static_cast(obj.rayTracingPrimitiveCulling), 45); +} +#endif // VK_ENABLE_BETA_EXTENSIONS +#ifdef VK_ENABLE_BETA_EXTENSIONS +void DumpVkPhysicalDeviceRayTracingPropertiesKHR(Printer &p, std::string name, VkPhysicalDeviceRayTracingPropertiesKHR &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyValue("shaderGroupHandleSize", obj.shaderGroupHandleSize, 38); + p.PrintKeyValue("maxRecursionDepth", obj.maxRecursionDepth, 38); + p.PrintKeyValue("maxShaderGroupStride", obj.maxShaderGroupStride, 38); + p.PrintKeyValue("shaderGroupBaseAlignment", obj.shaderGroupBaseAlignment, 38); + p.PrintKeyValue("maxGeometryCount", obj.maxGeometryCount, 38); + p.PrintKeyValue("maxInstanceCount", obj.maxInstanceCount, 38); + p.PrintKeyValue("maxPrimitiveCount", obj.maxPrimitiveCount, 38); + p.PrintKeyValue("maxDescriptorSetAccelerationStructures", obj.maxDescriptorSetAccelerationStructures, 38); + p.PrintKeyValue("shaderGroupHandleCaptureReplaySize", obj.shaderGroupHandleCaptureReplaySize, 38); +} +#endif // VK_ENABLE_BETA_EXTENSIONS void DumpVkDrmFormatModifierPropertiesEXT(Printer &p, std::string name, VkDrmFormatModifierPropertiesEXT &obj) { ObjectWrapper object{p, name}; p.PrintKeyValue("drmFormatModifier", obj.drmFormatModifier, 27); @@ -1763,6 +1798,10 @@ void DumpVkPhysicalDeviceTransformFeedbackPropertiesEXT(Printer &p, std::string p.PrintKeyBool("transformFeedbackRasterizationStreamSelect", static_cast(obj.transformFeedbackRasterizationStreamSelect), 42); p.PrintKeyBool("transformFeedbackDraw", static_cast(obj.transformFeedbackDraw), 42); } +void DumpVkPhysicalDevicePipelineCreationCacheControlFeaturesEXT(Printer &p, std::string name, VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT &obj) { + ObjectWrapper object{p, name}; + p.PrintKeyBool("pipelineCreationCacheControl", static_cast(obj.pipelineCreationCacheControl), 28); +} void DumpVkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT(Printer &p, std::string name, VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT &obj) { ObjectWrapper object{p, name}; p.PrintKeyBool("textureCompressionASTC_HDR", static_cast(obj.textureCompressionASTC_HDR), 26); @@ -1802,6 +1841,9 @@ pNextChainInfos get_chain_infos() { {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES, sizeof(VkPhysicalDevicePointClippingProperties)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES, sizeof(VkPhysicalDeviceProtectedMemoryProperties)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR, sizeof(VkPhysicalDevicePushDescriptorPropertiesKHR)}, +#ifdef VK_ENABLE_BETA_EXTENSIONS + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_KHR, sizeof(VkPhysicalDeviceRayTracingPropertiesKHR)}, +#endif // VK_ENABLE_BETA_EXTENSIONS {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT, sizeof(VkPhysicalDeviceSampleLocationsPropertiesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES, sizeof(VkPhysicalDeviceSamplerFilterMinmaxProperties)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES, sizeof(VkPhysicalDeviceSubgroupProperties)}, @@ -1836,8 +1878,12 @@ pNextChainInfos get_chain_infos() { {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT, sizeof(VkPhysicalDeviceMemoryPriorityFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES, sizeof(VkPhysicalDeviceMultiviewFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR, sizeof(VkPhysicalDevicePerformanceQueryFeaturesKHR)}, + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT, sizeof(VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR, sizeof(VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES, sizeof(VkPhysicalDeviceProtectedMemoryFeatures)}, +#ifdef VK_ENABLE_BETA_EXTENSIONS + {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_FEATURES_KHR, sizeof(VkPhysicalDeviceRayTracingFeaturesKHR)}, +#endif // VK_ENABLE_BETA_EXTENSIONS {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES, sizeof(VkPhysicalDeviceSamplerYcbcrConversionFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES, sizeof(VkPhysicalDeviceScalarBlockLayoutFeatures)}, {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES, sizeof(VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures)}, @@ -2006,6 +2052,14 @@ void chain_iterator_phys_device_props2(Printer &p, AppInstance &inst, AppGpu &gp DumpVkPhysicalDeviceBlendOperationAdvancedPropertiesEXT(p, "VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT", *props); p.AddNewline(); } +#ifdef VK_ENABLE_BETA_EXTENSIONS + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_KHR && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_RAY_TRACING_EXTENSION_NAME))) { + VkPhysicalDeviceRayTracingPropertiesKHR* props = (VkPhysicalDeviceRayTracingPropertiesKHR*)structure; + DumpVkPhysicalDeviceRayTracingPropertiesKHR(p, "VkPhysicalDeviceRayTracingPropertiesKHR", *props); + p.AddNewline(); + } +#endif // VK_ENABLE_BETA_EXTENSIONS if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME))) { VkPhysicalDeviceExternalMemoryHostPropertiesEXT* props = (VkPhysicalDeviceExternalMemoryHostPropertiesEXT*)structure; @@ -2247,6 +2301,14 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place, DumpVkPhysicalDeviceBlendOperationAdvancedFeaturesEXT(p, "VkPhysicalDeviceBlendOperationAdvancedFeaturesEXT", *props); p.AddNewline(); } +#ifdef VK_ENABLE_BETA_EXTENSIONS + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_FEATURES_KHR && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_RAY_TRACING_EXTENSION_NAME))) { + VkPhysicalDeviceRayTracingFeaturesKHR* props = (VkPhysicalDeviceRayTracingFeaturesKHR*)structure; + DumpVkPhysicalDeviceRayTracingFeaturesKHR(p, "VkPhysicalDeviceRayTracingFeaturesKHR", *props); + p.AddNewline(); + } +#endif // VK_ENABLE_BETA_EXTENSIONS if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_CLOCK_EXTENSION_NAME))) { VkPhysicalDeviceShaderClockFeaturesKHR* props = (VkPhysicalDeviceShaderClockFeaturesKHR*)structure; @@ -2331,6 +2393,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, void * place, DumpVkPhysicalDeviceTransformFeedbackFeaturesEXT(p, "VkPhysicalDeviceTransformFeedbackFeaturesEXT", *props); p.AddNewline(); } + if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT && + (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_PIPELINE_CREATION_CACHE_CONTROL_EXTENSION_NAME))) { + VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT* props = (VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT*)structure; + DumpVkPhysicalDevicePipelineCreationCacheControlFeaturesEXT(p, "VkPhysicalDevicePipelineCreationCacheControlFeaturesEXT", *props); + p.AddNewline(); + } if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_HDR_FEATURES_EXT && (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME))) { VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT* props = (VkPhysicalDeviceTextureCompressionASTCHDRFeaturesEXT*)structure; -- 2.7.4