diff --git a/CMakeLists.txt b/CMakeLists.txt index 3812871ff..fbd3da828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # ~~~ cmake_minimum_required(VERSION 3.17.2) -project(VULKAN_LOADER VERSION 1.3.275 LANGUAGES C) +project(VULKAN_LOADER VERSION 1.3.276 LANGUAGES C) # This variable enables downstream users to customize the target API # variant (e.g. Vulkan SC) diff --git a/loader/generated/vk_layer_dispatch_table.h b/loader/generated/vk_layer_dispatch_table.h index f40fd03c9..14b2ac3d9 100644 --- a/loader/generated/vk_layer_dispatch_table.h +++ b/loader/generated/vk_layer_dispatch_table.h @@ -615,6 +615,10 @@ typedef struct VkLayerDispatchTable_ { // ---- VK_KHR_fragment_shading_rate extension commands PFN_vkCmdSetFragmentShadingRateKHR CmdSetFragmentShadingRateKHR; + // ---- VK_KHR_dynamic_rendering_local_read extension commands + PFN_vkCmdSetRenderingAttachmentLocationsKHR CmdSetRenderingAttachmentLocationsKHR; + PFN_vkCmdSetRenderingInputAttachmentIndicesKHR CmdSetRenderingInputAttachmentIndicesKHR; + // ---- VK_KHR_present_wait extension commands PFN_vkWaitForPresentKHR WaitForPresentKHR; @@ -675,6 +679,9 @@ typedef struct VkLayerDispatchTable_ { PFN_vkGetDeviceImageSubresourceLayoutKHR GetDeviceImageSubresourceLayoutKHR; PFN_vkGetImageSubresourceLayout2KHR GetImageSubresourceLayout2KHR; + // ---- VK_KHR_line_rasterization extension commands + PFN_vkCmdSetLineStippleKHR CmdSetLineStippleKHR; + // ---- VK_KHR_calibrated_timestamps extension commands PFN_vkGetCalibratedTimestampsKHR GetCalibratedTimestampsKHR; @@ -1055,7 +1062,6 @@ typedef struct VkLayerDispatchTable_ { PFN_vkGetPipelineIndirectDeviceAddressNV GetPipelineIndirectDeviceAddressNV; // ---- VK_EXT_extended_dynamic_state3 extension commands - PFN_vkCmdSetTessellationDomainOriginEXT CmdSetTessellationDomainOriginEXT; PFN_vkCmdSetDepthClampEnableEXT CmdSetDepthClampEnableEXT; PFN_vkCmdSetPolygonModeEXT CmdSetPolygonModeEXT; PFN_vkCmdSetRasterizationSamplesEXT CmdSetRasterizationSamplesEXT; @@ -1066,6 +1072,7 @@ typedef struct VkLayerDispatchTable_ { PFN_vkCmdSetColorBlendEnableEXT CmdSetColorBlendEnableEXT; PFN_vkCmdSetColorBlendEquationEXT CmdSetColorBlendEquationEXT; PFN_vkCmdSetColorWriteMaskEXT CmdSetColorWriteMaskEXT; + PFN_vkCmdSetTessellationDomainOriginEXT CmdSetTessellationDomainOriginEXT; PFN_vkCmdSetRasterizationStreamEXT CmdSetRasterizationStreamEXT; PFN_vkCmdSetConservativeRasterizationModeEXT CmdSetConservativeRasterizationModeEXT; PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT CmdSetExtraPrimitiveOverestimationSizeEXT; diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c index 23b40c33a..b74369c86 100644 --- a/loader/generated/vk_loader_extensions.c +++ b/loader/generated/vk_loader_extensions.c @@ -656,6 +656,10 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo // ---- VK_KHR_fragment_shading_rate extension commands table->CmdSetFragmentShadingRateKHR = (PFN_vkCmdSetFragmentShadingRateKHR)gdpa(dev, "vkCmdSetFragmentShadingRateKHR"); + // ---- VK_KHR_dynamic_rendering_local_read extension commands + table->CmdSetRenderingAttachmentLocationsKHR = (PFN_vkCmdSetRenderingAttachmentLocationsKHR)gdpa(dev, "vkCmdSetRenderingAttachmentLocationsKHR"); + table->CmdSetRenderingInputAttachmentIndicesKHR = (PFN_vkCmdSetRenderingInputAttachmentIndicesKHR)gdpa(dev, "vkCmdSetRenderingInputAttachmentIndicesKHR"); + // ---- VK_KHR_present_wait extension commands table->WaitForPresentKHR = (PFN_vkWaitForPresentKHR)gdpa(dev, "vkWaitForPresentKHR"); @@ -716,6 +720,9 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo table->GetDeviceImageSubresourceLayoutKHR = (PFN_vkGetDeviceImageSubresourceLayoutKHR)gdpa(dev, "vkGetDeviceImageSubresourceLayoutKHR"); table->GetImageSubresourceLayout2KHR = (PFN_vkGetImageSubresourceLayout2KHR)gdpa(dev, "vkGetImageSubresourceLayout2KHR"); + // ---- VK_KHR_line_rasterization extension commands + table->CmdSetLineStippleKHR = (PFN_vkCmdSetLineStippleKHR)gdpa(dev, "vkCmdSetLineStippleKHR"); + // ---- VK_KHR_calibrated_timestamps extension commands table->GetCalibratedTimestampsKHR = (PFN_vkGetCalibratedTimestampsKHR)gdpa(dev, "vkGetCalibratedTimestampsKHR"); @@ -1096,7 +1103,6 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo table->GetPipelineIndirectDeviceAddressNV = (PFN_vkGetPipelineIndirectDeviceAddressNV)gdpa(dev, "vkGetPipelineIndirectDeviceAddressNV"); // ---- VK_EXT_extended_dynamic_state3 extension commands - table->CmdSetTessellationDomainOriginEXT = (PFN_vkCmdSetTessellationDomainOriginEXT)gdpa(dev, "vkCmdSetTessellationDomainOriginEXT"); table->CmdSetDepthClampEnableEXT = (PFN_vkCmdSetDepthClampEnableEXT)gdpa(dev, "vkCmdSetDepthClampEnableEXT"); table->CmdSetPolygonModeEXT = (PFN_vkCmdSetPolygonModeEXT)gdpa(dev, "vkCmdSetPolygonModeEXT"); table->CmdSetRasterizationSamplesEXT = (PFN_vkCmdSetRasterizationSamplesEXT)gdpa(dev, "vkCmdSetRasterizationSamplesEXT"); @@ -1107,6 +1113,7 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo table->CmdSetColorBlendEnableEXT = (PFN_vkCmdSetColorBlendEnableEXT)gdpa(dev, "vkCmdSetColorBlendEnableEXT"); table->CmdSetColorBlendEquationEXT = (PFN_vkCmdSetColorBlendEquationEXT)gdpa(dev, "vkCmdSetColorBlendEquationEXT"); table->CmdSetColorWriteMaskEXT = (PFN_vkCmdSetColorWriteMaskEXT)gdpa(dev, "vkCmdSetColorWriteMaskEXT"); + table->CmdSetTessellationDomainOriginEXT = (PFN_vkCmdSetTessellationDomainOriginEXT)gdpa(dev, "vkCmdSetTessellationDomainOriginEXT"); table->CmdSetRasterizationStreamEXT = (PFN_vkCmdSetRasterizationStreamEXT)gdpa(dev, "vkCmdSetRasterizationStreamEXT"); table->CmdSetConservativeRasterizationModeEXT = (PFN_vkCmdSetConservativeRasterizationModeEXT)gdpa(dev, "vkCmdSetConservativeRasterizationModeEXT"); table->CmdSetExtraPrimitiveOverestimationSizeEXT = (PFN_vkCmdSetExtraPrimitiveOverestimationSizeEXT)gdpa(dev, "vkCmdSetExtraPrimitiveOverestimationSizeEXT"); @@ -2404,6 +2411,10 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis // ---- VK_KHR_fragment_shading_rate extension commands if (!strcmp(name, "CmdSetFragmentShadingRateKHR")) return (void *)table->CmdSetFragmentShadingRateKHR; + // ---- VK_KHR_dynamic_rendering_local_read extension commands + if (!strcmp(name, "CmdSetRenderingAttachmentLocationsKHR")) return (void *)table->CmdSetRenderingAttachmentLocationsKHR; + if (!strcmp(name, "CmdSetRenderingInputAttachmentIndicesKHR")) return (void *)table->CmdSetRenderingInputAttachmentIndicesKHR; + // ---- VK_KHR_present_wait extension commands if (!strcmp(name, "WaitForPresentKHR")) return (void *)table->WaitForPresentKHR; @@ -2464,6 +2475,9 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis if (!strcmp(name, "GetDeviceImageSubresourceLayoutKHR")) return (void *)table->GetDeviceImageSubresourceLayoutKHR; if (!strcmp(name, "GetImageSubresourceLayout2KHR")) return (void *)table->GetImageSubresourceLayout2KHR; + // ---- VK_KHR_line_rasterization extension commands + if (!strcmp(name, "CmdSetLineStippleKHR")) return (void *)table->CmdSetLineStippleKHR; + // ---- VK_KHR_calibrated_timestamps extension commands if (!strcmp(name, "GetCalibratedTimestampsKHR")) return (void *)table->GetCalibratedTimestampsKHR; @@ -2844,7 +2858,6 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis if (!strcmp(name, "GetPipelineIndirectDeviceAddressNV")) return (void *)table->GetPipelineIndirectDeviceAddressNV; // ---- VK_EXT_extended_dynamic_state3 extension commands - if (!strcmp(name, "CmdSetTessellationDomainOriginEXT")) return (void *)table->CmdSetTessellationDomainOriginEXT; if (!strcmp(name, "CmdSetDepthClampEnableEXT")) return (void *)table->CmdSetDepthClampEnableEXT; if (!strcmp(name, "CmdSetPolygonModeEXT")) return (void *)table->CmdSetPolygonModeEXT; if (!strcmp(name, "CmdSetRasterizationSamplesEXT")) return (void *)table->CmdSetRasterizationSamplesEXT; @@ -2855,6 +2868,7 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis if (!strcmp(name, "CmdSetColorBlendEnableEXT")) return (void *)table->CmdSetColorBlendEnableEXT; if (!strcmp(name, "CmdSetColorBlendEquationEXT")) return (void *)table->CmdSetColorBlendEquationEXT; if (!strcmp(name, "CmdSetColorWriteMaskEXT")) return (void *)table->CmdSetColorWriteMaskEXT; + if (!strcmp(name, "CmdSetTessellationDomainOriginEXT")) return (void *)table->CmdSetTessellationDomainOriginEXT; if (!strcmp(name, "CmdSetRasterizationStreamEXT")) return (void *)table->CmdSetRasterizationStreamEXT; if (!strcmp(name, "CmdSetConservativeRasterizationModeEXT")) return (void *)table->CmdSetConservativeRasterizationModeEXT; if (!strcmp(name, "CmdSetExtraPrimitiveOverestimationSizeEXT")) return (void *)table->CmdSetExtraPrimitiveOverestimationSizeEXT; @@ -4229,6 +4243,35 @@ VKAPI_ATTR void VKAPI_CALL CmdSetFragmentShadingRateKHR( } +// ---- VK_KHR_dynamic_rendering_local_read extension trampoline/terminators + +VKAPI_ATTR void VKAPI_CALL CmdSetRenderingAttachmentLocationsKHR( + VkCommandBuffer commandBuffer, + const VkRenderingAttachmentLocationInfoKHR* pLocationInfo) { + const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer); + if (NULL == disp) { + loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0, + "vkCmdSetRenderingAttachmentLocationsKHR: Invalid commandBuffer " + "[VUID-vkCmdSetRenderingAttachmentLocationsKHR-commandBuffer-parameter]"); + abort(); /* Intentionally fail so user can correct issue. */ + } + disp->CmdSetRenderingAttachmentLocationsKHR(commandBuffer, pLocationInfo); +} + +VKAPI_ATTR void VKAPI_CALL CmdSetRenderingInputAttachmentIndicesKHR( + VkCommandBuffer commandBuffer, + const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo) { + const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer); + if (NULL == disp) { + loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0, + "vkCmdSetRenderingInputAttachmentIndicesKHR: Invalid commandBuffer " + "[VUID-vkCmdSetRenderingInputAttachmentIndicesKHR-commandBuffer-parameter]"); + abort(); /* Intentionally fail so user can correct issue. */ + } + disp->CmdSetRenderingInputAttachmentIndicesKHR(commandBuffer, pLocationInfo); +} + + // ---- VK_KHR_present_wait extension trampoline/terminators VKAPI_ATTR VkResult VKAPI_CALL WaitForPresentKHR( @@ -4856,6 +4899,23 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceCooperativeMatrixProp } +// ---- VK_KHR_line_rasterization extension trampoline/terminators + +VKAPI_ATTR void VKAPI_CALL CmdSetLineStippleKHR( + VkCommandBuffer commandBuffer, + uint32_t lineStippleFactor, + uint16_t lineStipplePattern) { + const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer); + if (NULL == disp) { + loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0, + "vkCmdSetLineStippleKHR: Invalid commandBuffer " + "[VUID-vkCmdSetLineStippleKHR-commandBuffer-parameter]"); + abort(); /* Intentionally fail so user can correct issue. */ + } + disp->CmdSetLineStippleKHR(commandBuffer, lineStippleFactor, lineStipplePattern); +} + + // ---- VK_KHR_calibrated_timestamps extension trampoline/terminators VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCalibrateableTimeDomainsKHR( @@ -8592,19 +8652,6 @@ VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetPipelineIndirectDeviceAddressNV( // ---- VK_EXT_extended_dynamic_state3 extension trampoline/terminators -VKAPI_ATTR void VKAPI_CALL CmdSetTessellationDomainOriginEXT( - VkCommandBuffer commandBuffer, - VkTessellationDomainOrigin domainOrigin) { - const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer); - if (NULL == disp) { - loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0, - "vkCmdSetTessellationDomainOriginEXT: Invalid commandBuffer " - "[VUID-vkCmdSetTessellationDomainOriginEXT-commandBuffer-parameter]"); - abort(); /* Intentionally fail so user can correct issue. */ - } - disp->CmdSetTessellationDomainOriginEXT(commandBuffer, domainOrigin); -} - VKAPI_ATTR void VKAPI_CALL CmdSetDepthClampEnableEXT( VkCommandBuffer commandBuffer, VkBool32 depthClampEnable) { @@ -8742,6 +8789,19 @@ VKAPI_ATTR void VKAPI_CALL CmdSetColorWriteMaskEXT( disp->CmdSetColorWriteMaskEXT(commandBuffer, firstAttachment, attachmentCount, pColorWriteMasks); } +VKAPI_ATTR void VKAPI_CALL CmdSetTessellationDomainOriginEXT( + VkCommandBuffer commandBuffer, + VkTessellationDomainOrigin domainOrigin) { + const VkLayerDispatchTable *disp = loader_get_dispatch(commandBuffer); + if (NULL == disp) { + loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0, + "vkCmdSetTessellationDomainOriginEXT: Invalid commandBuffer " + "[VUID-vkCmdSetTessellationDomainOriginEXT-commandBuffer-parameter]"); + abort(); /* Intentionally fail so user can correct issue. */ + } + disp->CmdSetTessellationDomainOriginEXT(commandBuffer, domainOrigin); +} + VKAPI_ATTR void VKAPI_CALL CmdSetRasterizationStreamEXT( VkCommandBuffer commandBuffer, uint32_t rasterizationStream) { @@ -10106,6 +10166,16 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na return true; } + // ---- VK_KHR_dynamic_rendering_local_read extension commands + if (!strcmp("vkCmdSetRenderingAttachmentLocationsKHR", name)) { + *addr = (void *)CmdSetRenderingAttachmentLocationsKHR; + return true; + } + if (!strcmp("vkCmdSetRenderingInputAttachmentIndicesKHR", name)) { + *addr = (void *)CmdSetRenderingInputAttachmentIndicesKHR; + return true; + } + // ---- VK_KHR_present_wait extension commands if (!strcmp("vkWaitForPresentKHR", name)) { *addr = (void *)WaitForPresentKHR; @@ -10290,6 +10360,12 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na return true; } + // ---- VK_KHR_line_rasterization extension commands + if (!strcmp("vkCmdSetLineStippleKHR", name)) { + *addr = (void *)CmdSetLineStippleKHR; + return true; + } + // ---- VK_KHR_calibrated_timestamps extension commands if (!strcmp("vkGetPhysicalDeviceCalibrateableTimeDomainsKHR", name)) { *addr = (void *)GetPhysicalDeviceCalibrateableTimeDomainsKHR; @@ -11407,10 +11483,6 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na } // ---- VK_EXT_extended_dynamic_state3 extension commands - if (!strcmp("vkCmdSetTessellationDomainOriginEXT", name)) { - *addr = (void *)CmdSetTessellationDomainOriginEXT; - return true; - } if (!strcmp("vkCmdSetDepthClampEnableEXT", name)) { *addr = (void *)CmdSetDepthClampEnableEXT; return true; @@ -11451,6 +11523,10 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na *addr = (void *)CmdSetColorWriteMaskEXT; return true; } + if (!strcmp("vkCmdSetTessellationDomainOriginEXT", name)) { + *addr = (void *)CmdSetTessellationDomainOriginEXT; + return true; + } if (!strcmp("vkCmdSetRasterizationStreamEXT", name)) { *addr = (void *)CmdSetRasterizationStreamEXT; return true; diff --git a/loader/loader.rc b/loader/loader.rc index bf1280b1d..ce83b4f38 100644 --- a/loader/loader.rc +++ b/loader/loader.rc @@ -22,8 +22,8 @@ #include "winres.h" // All set through CMake -#define VER_FILE_VERSION 1, 3, 275, 0 -#define VER_FILE_DESCRIPTION_STR "1.3.275.Dev Build" +#define VER_FILE_VERSION 1, 3, 276, 0 +#define VER_FILE_DESCRIPTION_STR "1.3.276.Dev Build" #define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build" #define VER_COPYRIGHT_STR "Copyright (C) 2015-2024" diff --git a/scripts/known_good.json b/scripts/known_good.json index 7bb674218..c8764dc71 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -7,7 +7,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.275" + "commit": "v1.3.276" }, { "name": "googletest",