From 77ab40e1e86c156b7249d3b9e7a49522b5d4635a Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Thu, 10 Oct 2019 11:20:16 +0200 Subject: [PATCH] Update vulkan_core.h Components: Vulkan Change-Id: Ibcc182d94ae731ab7bd396d450705f6d4f4b8b8e --- .../vulkan/vkApiExtensionDependencyInfo.inl | 4 +- .../vulkancts/framework/vulkan/vkBasicTypes.inl | 22 +-- .../framework/vulkan/vkConcreteDeviceInterface.inl | 6 +- .../framework/vulkan/vkDeviceDriverImpl.inl | 24 +-- .../framework/vulkan/vkDeviceFeatures.inl | 2 +- .../framework/vulkan/vkDeviceFunctionPointers.inl | 6 +- .../framework/vulkan/vkExtensionFunctions.inl | 14 +- .../framework/vulkan/vkFunctionPointerTypes.inl | 6 +- .../framework/vulkan/vkGetStructureTypeImpl.inl | 70 ++++---- .../vulkan/vkInitDeviceFunctionPointers.inl | 6 +- .../framework/vulkan/vkNullDriverImpl.inl | 46 ++--- external/vulkancts/framework/vulkan/vkStrUtil.inl | 20 +-- .../vulkancts/framework/vulkan/vkStrUtilImpl.inl | 182 +++++++++---------- .../vulkancts/framework/vulkan/vkStructTypes.inl | 116 ++++++------ .../framework/vulkan/vkVirtualDeviceInterface.inl | 6 +- external/vulkancts/framework/vulkan/vkVulkan_c.inl | 194 +++++++++++---------- external/vulkancts/scripts/gen_ext_deps.py | 4 +- external/vulkancts/scripts/src/vulkan_core.h | 194 +++++++++++---------- 18 files changed, 466 insertions(+), 456 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl b/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl index 0426b96..1d180ad 100644 --- a/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl +++ b/external/vulkancts/framework/vulkan/vkApiExtensionDependencyInfo.inl @@ -1,7 +1,7 @@ /* WARNING: This is auto-generated file. Do not modify, since changes will * be lost! Modify the generating script instead. * - * Generated from Khronos Vulkan API description (vk.xml) revision c5261decf68cb2ef8cd934b8a3e4824bfde81cda. + * Generated from Khronos Vulkan API description (vk.xml) revision 22a5a1459fbe8be546079525c4c9d50bfc20b30b. */ static const std::tuple instanceExtensionDependencies[] = { @@ -157,6 +157,7 @@ static const std::tuple deviceExte std::make_tuple(1, 0, "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_get_memory_requirements2"), std::make_tuple(1, 0, "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_shader_atomic_int64", "VK_KHR_get_physical_device_properties2"), + std::make_tuple(1, 0, "VK_KHR_shader_clock", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_shader_float16_int8", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_shader_float_controls", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_shared_presentable_image", "VK_KHR_swapchain"), @@ -171,6 +172,7 @@ static const std::tuple deviceExte std::make_tuple(1, 0, "VK_KHR_swapchain_mutable_format", "VK_KHR_image_format_list"), std::make_tuple(1, 1, "VK_KHR_swapchain_mutable_format", "VK_KHR_swapchain"), std::make_tuple(1, 1, "VK_KHR_swapchain_mutable_format", "VK_KHR_image_format_list"), + std::make_tuple(1, 0, "VK_KHR_timeline_semaphore", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_uniform_buffer_standard_layout", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_variable_pointers", "VK_KHR_get_physical_device_properties2"), std::make_tuple(1, 0, "VK_KHR_variable_pointers", "VK_KHR_storage_buffer_storage_class"), diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index a029ca3..7ff76d1 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -402,8 +402,8 @@ enum VkStructureType VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, - VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR = 1000181000, + VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT = 1000184000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, @@ -1434,6 +1434,14 @@ enum VkShaderFloatControlsIndependenceKHR VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_MAX_ENUM_KHR = 0x7FFFFFFF, }; +enum VkSemaphoreTypeKHR +{ + VK_SEMAPHORE_TYPE_BINARY_KHR = 0, + VK_SEMAPHORE_TYPE_TIMELINE_KHR = 1, + VK_SEMAPHORE_TYPE_KHR_LAST, + VK_SEMAPHORE_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF, +}; + enum VkPipelineExecutableStatisticFormatKHR { VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_BOOL32_KHR = 0, @@ -1444,14 +1452,6 @@ enum VkPipelineExecutableStatisticFormatKHR VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_MAX_ENUM_KHR = 0x7FFFFFFF, }; -enum VkSemaphoreTypeKHR -{ - VK_SEMAPHORE_TYPE_BINARY_KHR = 0, - VK_SEMAPHORE_TYPE_TIMELINE_KHR = 1, - VK_SEMAPHORE_TYPE_KHR_LAST, - VK_SEMAPHORE_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF, -}; - enum VkDebugReportObjectTypeEXT { VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT = 0, @@ -2878,15 +2878,16 @@ VK_DEFINE_PLATFORM_TYPE(CAMetalLayer, void*); #define VK_KHR_SHADER_SUBGROUP_EXTENDED_TYPES_SPEC_VERSION 1 #define VK_KHR_8BIT_STORAGE_SPEC_VERSION 1 #define VK_KHR_SHADER_ATOMIC_INT64_SPEC_VERSION 1 +#define VK_KHR_SHADER_CLOCK_SPEC_VERSION 1 #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 #define VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION 4 #define VK_KHR_DEPTH_STENCIL_RESOLVE_SPEC_VERSION 1 #define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION 1 +#define VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION 2 #define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 3 #define VK_KHR_SURFACE_PROTECTED_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_SPEC_VERSION 1 #define VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_SPEC_VERSION 1 -#define VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION 2 #define VK_EXT_DEBUG_REPORT_SPEC_VERSION 9 #define VK_NV_GLSL_SHADER_SPEC_VERSION 1 #define VK_EXT_DEPTH_RANGE_UNRESTRICTED_SPEC_VERSION 1 @@ -2949,7 +2950,6 @@ VK_DEFINE_PLATFORM_TYPE(CAMetalLayer, void*); #define VK_NV_FILL_RECTANGLE_SPEC_VERSION 1 #define VK_NV_SHADER_SM_BUILTINS_SPEC_VERSION 1 #define VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION 1 -#define VK_KHR_SHADER_CLOCK_SPEC_VERSION 1 #define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 1 #define VK_EXT_VALIDATION_CACHE_SPEC_VERSION 1 #define VK_EXT_DESCRIPTOR_INDEXING_SPEC_VERSION 2 diff --git a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl index ad96a93..c1b49f4 100644 --- a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl @@ -162,12 +162,12 @@ virtual VkResult importFenceFdKHR (VkDevice device, const VkImportFence virtual VkResult getFenceFdKHR (VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd) const; virtual void cmdDrawIndirectCountKHR (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const; virtual void cmdDrawIndexedIndirectCountKHR (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const; -virtual VkResult getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const; -virtual VkResult getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const; -virtual VkResult getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const; virtual VkResult getSemaphoreCounterValueKHR (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const; virtual VkResult waitSemaphoresKHR (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout) const; virtual VkResult signalSemaphoreKHR (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo) const; +virtual VkResult getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const; +virtual VkResult getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const; +virtual VkResult getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const; virtual VkResult debugMarkerSetObjectTagEXT (VkDevice device, const VkDebugMarkerObjectTagInfoEXT* pTagInfo) const; virtual VkResult debugMarkerSetObjectNameEXT (VkDevice device, const VkDebugMarkerObjectNameInfoEXT* pNameInfo) const; virtual void cmdDebugMarkerBeginEXT (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const; diff --git a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl index c9dbc8d..9034d2b 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl @@ -807,34 +807,34 @@ void DeviceDriver::cmdDrawIndexedIndirectCountKHR (VkCommandBuffer commandBuffer m_vk.cmdDrawIndexedIndirectCountKHR(commandBuffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride); } -VkResult DeviceDriver::getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const +VkResult DeviceDriver::getSemaphoreCounterValueKHR (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const { - return m_vk.getPipelineExecutablePropertiesKHR(device, pPipelineInfo, pExecutableCount, pProperties); + return m_vk.getSemaphoreCounterValueKHR(device, semaphore, pValue); } -VkResult DeviceDriver::getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const +VkResult DeviceDriver::waitSemaphoresKHR (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout) const { - return m_vk.getPipelineExecutableStatisticsKHR(device, pExecutableInfo, pStatisticCount, pStatistics); + return m_vk.waitSemaphoresKHR(device, pWaitInfo, timeout); } -VkResult DeviceDriver::getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const +VkResult DeviceDriver::signalSemaphoreKHR (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo) const { - return m_vk.getPipelineExecutableInternalRepresentationsKHR(device, pExecutableInfo, pInternalRepresentationCount, pInternalRepresentations); + return m_vk.signalSemaphoreKHR(device, pSignalInfo); } -VkResult DeviceDriver::getSemaphoreCounterValueKHR (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const +VkResult DeviceDriver::getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const { - return m_vk.getSemaphoreCounterValueKHR(device, semaphore, pValue); + return m_vk.getPipelineExecutablePropertiesKHR(device, pPipelineInfo, pExecutableCount, pProperties); } -VkResult DeviceDriver::waitSemaphoresKHR (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout) const +VkResult DeviceDriver::getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const { - return m_vk.waitSemaphoresKHR(device, pWaitInfo, timeout); + return m_vk.getPipelineExecutableStatisticsKHR(device, pExecutableInfo, pStatisticCount, pStatistics); } -VkResult DeviceDriver::signalSemaphoreKHR (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo) const +VkResult DeviceDriver::getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const { - return m_vk.signalSemaphoreKHR(device, pSignalInfo); + return m_vk.getPipelineExecutableInternalRepresentationsKHR(device, pExecutableInfo, pInternalRepresentationCount, pInternalRepresentations); } VkResult DeviceDriver::debugMarkerSetObjectTagEXT (VkDevice device, const VkDebugMarkerObjectTagInfoEXT* pTagInfo) const diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl b/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl index b2d858e..00161a8 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures.inl @@ -36,7 +36,7 @@ namespace vk #define VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME "VK_KHR_sampler_ycbcr_conversion" #define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout" #define VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME "VK_KHR_shader_atomic_int64" -#define VK_KHR_SHADER_CLOCK_EXTENSION_NAME "VK_KHR_shader_clock" +#define VK_KHR_SHADER_CLOCK_EXTENSION_NAME "VK_KHR_shader_clock" #define VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME "VK_EXT_shader_demote_to_helper_invocation" #define VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME "VK_KHR_shader_draw_parameters" #define VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME "VK_KHR_shader_float16_int8" diff --git a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl index 2889d82..065eb30 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl @@ -162,12 +162,12 @@ ImportFenceFdKHRFunc importFenceFdKHR; GetFenceFdKHRFunc getFenceFdKHR; CmdDrawIndirectCountKHRFunc cmdDrawIndirectCountKHR; CmdDrawIndexedIndirectCountKHRFunc cmdDrawIndexedIndirectCountKHR; -GetPipelineExecutablePropertiesKHRFunc getPipelineExecutablePropertiesKHR; -GetPipelineExecutableStatisticsKHRFunc getPipelineExecutableStatisticsKHR; -GetPipelineExecutableInternalRepresentationsKHRFunc getPipelineExecutableInternalRepresentationsKHR; GetSemaphoreCounterValueKHRFunc getSemaphoreCounterValueKHR; WaitSemaphoresKHRFunc waitSemaphoresKHR; SignalSemaphoreKHRFunc signalSemaphoreKHR; +GetPipelineExecutablePropertiesKHRFunc getPipelineExecutablePropertiesKHR; +GetPipelineExecutableStatisticsKHRFunc getPipelineExecutableStatisticsKHR; +GetPipelineExecutableInternalRepresentationsKHRFunc getPipelineExecutableInternalRepresentationsKHR; DebugMarkerSetObjectTagEXTFunc debugMarkerSetObjectTagEXT; DebugMarkerSetObjectNameEXTFunc debugMarkerSetObjectNameEXT; CmdDebugMarkerBeginEXTFunc cmdDebugMarkerBeginEXT; diff --git a/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl b/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl index 7a467a6..9985fd4 100644 --- a/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl +++ b/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl @@ -265,18 +265,18 @@ void getDeviceExtensionFunctions (deUint32 apiVersion, ::std::string extName, :: functions.push_back("vkCmdDrawIndirectCountKHR"); functions.push_back("vkCmdDrawIndexedIndirectCountKHR"); } - else if (extName == "VK_KHR_pipeline_executable_properties") - { - functions.push_back("vkGetPipelineExecutablePropertiesKHR"); - functions.push_back("vkGetPipelineExecutableStatisticsKHR"); - functions.push_back("vkGetPipelineExecutableInternalRepresentationsKHR"); - } else if (extName == "VK_KHR_timeline_semaphore") { functions.push_back("vkGetSemaphoreCounterValueKHR"); functions.push_back("vkWaitSemaphoresKHR"); functions.push_back("vkSignalSemaphoreKHR"); } + else if (extName == "VK_KHR_pipeline_executable_properties") + { + functions.push_back("vkGetPipelineExecutablePropertiesKHR"); + functions.push_back("vkGetPipelineExecutableStatisticsKHR"); + functions.push_back("vkGetPipelineExecutableInternalRepresentationsKHR"); + } else if (extName == "VK_EXT_debug_marker") { functions.push_back("vkDebugMarkerSetObjectTagEXT"); @@ -535,8 +535,8 @@ void getDeviceExtensionFunctions (deUint32 apiVersion, ::std::string extName, :: "VK_KHR_bind_memory2", "VK_KHR_maintenance3", "VK_KHR_draw_indirect_count", - "VK_KHR_pipeline_executable_properties", "VK_KHR_timeline_semaphore", + "VK_KHR_pipeline_executable_properties", "VK_EXT_debug_marker", "VK_EXT_transform_feedback", "VK_NVX_image_view_handle", diff --git a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl index 201fe3d..db009df 100644 --- a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl +++ b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl @@ -235,12 +235,12 @@ typedef VKAPI_ATTR VkResult (VKAPI_CALL* BindImageMemory2KHRFunc) typedef VKAPI_ATTR void (VKAPI_CALL* GetDescriptorSetLayoutSupportKHRFunc) (VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport); typedef VKAPI_ATTR void (VKAPI_CALL* CmdDrawIndirectCountKHRFunc) (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride); typedef VKAPI_ATTR void (VKAPI_CALL* CmdDrawIndexedIndirectCountKHRFunc) (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride); -typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetPipelineExecutablePropertiesKHRFunc) (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties); -typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetPipelineExecutableStatisticsKHRFunc) (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics); -typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetPipelineExecutableInternalRepresentationsKHRFunc) (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations); typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetSemaphoreCounterValueKHRFunc) (VkDevice device, VkSemaphore semaphore, deUint64* pValue); typedef VKAPI_ATTR VkResult (VKAPI_CALL* WaitSemaphoresKHRFunc) (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout); typedef VKAPI_ATTR VkResult (VKAPI_CALL* SignalSemaphoreKHRFunc) (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo); +typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetPipelineExecutablePropertiesKHRFunc) (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties); +typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetPipelineExecutableStatisticsKHRFunc) (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics); +typedef VKAPI_ATTR VkResult (VKAPI_CALL* GetPipelineExecutableInternalRepresentationsKHRFunc) (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations); typedef VKAPI_ATTR VkResult (VKAPI_CALL* CreateDebugReportCallbackEXTFunc) (VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback); typedef VKAPI_ATTR void (VKAPI_CALL* DestroyDebugReportCallbackEXTFunc) (VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks* pAllocator); typedef VKAPI_ATTR void (VKAPI_CALL* DebugReportMessageEXTFunc) (VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, deUint64 object, deUintptr location, deInt32 messageCode, const char* pLayerPrefix, const char* pMessage); diff --git a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl index f70c97e..5221da0 100644 --- a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl +++ b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl @@ -786,6 +786,11 @@ template<> VkStructureType getStructureType VkStructureType getStructureType (void) +{ + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR; +} + template<> VkStructureType getStructureType (void) { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; @@ -806,79 +811,79 @@ template<> VkStructureType getStructureType VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_SURFACE_PROTECTED_CAPABILITIES_KHR; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR; + return VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR; + return VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR; + return VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_PROPERTIES_KHR; + return VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR; + return VK_STRUCTURE_TYPE_SURFACE_PROTECTED_CAPABILITIES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; + return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR; + return VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR; + return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_PROPERTIES_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO_KHR; + return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO_KHR; + return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR; } -template<> VkStructureType getStructureType (void) +template<> VkStructureType getStructureType (void) { - return VK_STRUCTURE_TYPE_SEMAPHORE_SIGNAL_INFO_KHR; + return VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR; } template<> VkStructureType getStructureType (void) @@ -1221,11 +1226,6 @@ template<> VkStructureType getStructureType VkStructureType getStructureType (void) -{ - return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR; -} - template<> VkStructureType getStructureType (void) { return VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT; diff --git a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl index a068fa5..325ffb0 100644 --- a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl @@ -192,12 +192,12 @@ m_vk.importFenceFdKHR = (ImportFenceFdKHRFunc) GET_PROC_ADDR("vkI m_vk.getFenceFdKHR = (GetFenceFdKHRFunc) GET_PROC_ADDR("vkGetFenceFdKHR"); m_vk.cmdDrawIndirectCountKHR = (CmdDrawIndirectCountKHRFunc) GET_PROC_ADDR("vkCmdDrawIndirectCountKHR"); m_vk.cmdDrawIndexedIndirectCountKHR = (CmdDrawIndexedIndirectCountKHRFunc) GET_PROC_ADDR("vkCmdDrawIndexedIndirectCountKHR"); -m_vk.getPipelineExecutablePropertiesKHR = (GetPipelineExecutablePropertiesKHRFunc) GET_PROC_ADDR("vkGetPipelineExecutablePropertiesKHR"); -m_vk.getPipelineExecutableStatisticsKHR = (GetPipelineExecutableStatisticsKHRFunc) GET_PROC_ADDR("vkGetPipelineExecutableStatisticsKHR"); -m_vk.getPipelineExecutableInternalRepresentationsKHR = (GetPipelineExecutableInternalRepresentationsKHRFunc) GET_PROC_ADDR("vkGetPipelineExecutableInternalRepresentationsKHR"); m_vk.getSemaphoreCounterValueKHR = (GetSemaphoreCounterValueKHRFunc) GET_PROC_ADDR("vkGetSemaphoreCounterValueKHR"); m_vk.waitSemaphoresKHR = (WaitSemaphoresKHRFunc) GET_PROC_ADDR("vkWaitSemaphoresKHR"); m_vk.signalSemaphoreKHR = (SignalSemaphoreKHRFunc) GET_PROC_ADDR("vkSignalSemaphoreKHR"); +m_vk.getPipelineExecutablePropertiesKHR = (GetPipelineExecutablePropertiesKHRFunc) GET_PROC_ADDR("vkGetPipelineExecutablePropertiesKHR"); +m_vk.getPipelineExecutableStatisticsKHR = (GetPipelineExecutableStatisticsKHRFunc) GET_PROC_ADDR("vkGetPipelineExecutableStatisticsKHR"); +m_vk.getPipelineExecutableInternalRepresentationsKHR = (GetPipelineExecutableInternalRepresentationsKHRFunc) GET_PROC_ADDR("vkGetPipelineExecutableInternalRepresentationsKHR"); m_vk.debugMarkerSetObjectTagEXT = (DebugMarkerSetObjectTagEXTFunc) GET_PROC_ADDR("vkDebugMarkerSetObjectTagEXT"); m_vk.debugMarkerSetObjectNameEXT = (DebugMarkerSetObjectNameEXTFunc) GET_PROC_ADDR("vkDebugMarkerSetObjectNameEXT"); m_vk.cmdDebugMarkerBeginEXT = (CmdDebugMarkerBeginEXTFunc) GET_PROC_ADDR("vkCmdDebugMarkerBeginEXT"); diff --git a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl index d79544f..125a9b0 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl @@ -1533,53 +1533,53 @@ VKAPI_ATTR void VKAPI_CALL cmdDrawIndexedIndirectCountKHR (VkCommandBuffer comma DE_UNREF(stride); } -VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) +VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreCounterValueKHR (VkDevice device, VkSemaphore semaphore, deUint64* pValue) { DE_UNREF(device); - DE_UNREF(pPipelineInfo); - DE_UNREF(pExecutableCount); - DE_UNREF(pProperties); + DE_UNREF(semaphore); + DE_UNREF(pValue); return VK_SUCCESS; } -VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) +VKAPI_ATTR VkResult VKAPI_CALL waitSemaphoresKHR (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout) { DE_UNREF(device); - DE_UNREF(pExecutableInfo); - DE_UNREF(pStatisticCount); - DE_UNREF(pStatistics); + DE_UNREF(pWaitInfo); + DE_UNREF(timeout); return VK_SUCCESS; } -VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) +VKAPI_ATTR VkResult VKAPI_CALL signalSemaphoreKHR (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo) { DE_UNREF(device); - DE_UNREF(pExecutableInfo); - DE_UNREF(pInternalRepresentationCount); - DE_UNREF(pInternalRepresentations); + DE_UNREF(pSignalInfo); return VK_SUCCESS; } -VKAPI_ATTR VkResult VKAPI_CALL getSemaphoreCounterValueKHR (VkDevice device, VkSemaphore semaphore, deUint64* pValue) +VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) { DE_UNREF(device); - DE_UNREF(semaphore); - DE_UNREF(pValue); + DE_UNREF(pPipelineInfo); + DE_UNREF(pExecutableCount); + DE_UNREF(pProperties); return VK_SUCCESS; } -VKAPI_ATTR VkResult VKAPI_CALL waitSemaphoresKHR (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout) +VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) { DE_UNREF(device); - DE_UNREF(pWaitInfo); - DE_UNREF(timeout); + DE_UNREF(pExecutableInfo); + DE_UNREF(pStatisticCount); + DE_UNREF(pStatistics); return VK_SUCCESS; } -VKAPI_ATTR VkResult VKAPI_CALL signalSemaphoreKHR (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo) +VKAPI_ATTR VkResult VKAPI_CALL getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) { DE_UNREF(device); - DE_UNREF(pSignalInfo); + DE_UNREF(pExecutableInfo); + DE_UNREF(pInternalRepresentationCount); + DE_UNREF(pInternalRepresentations); return VK_SUCCESS; } @@ -2702,12 +2702,12 @@ static const tcu::StaticFunctionLibrary::Entry s_deviceFunctions[] = VK_NULL_FUNC_ENTRY(vkGetDescriptorSetLayoutSupportKHR, getDescriptorSetLayoutSupport), VK_NULL_FUNC_ENTRY(vkCmdDrawIndirectCountKHR, cmdDrawIndirectCountKHR), VK_NULL_FUNC_ENTRY(vkCmdDrawIndexedIndirectCountKHR, cmdDrawIndexedIndirectCountKHR), - VK_NULL_FUNC_ENTRY(vkGetPipelineExecutablePropertiesKHR, getPipelineExecutablePropertiesKHR), - VK_NULL_FUNC_ENTRY(vkGetPipelineExecutableStatisticsKHR, getPipelineExecutableStatisticsKHR), - VK_NULL_FUNC_ENTRY(vkGetPipelineExecutableInternalRepresentationsKHR, getPipelineExecutableInternalRepresentationsKHR), VK_NULL_FUNC_ENTRY(vkGetSemaphoreCounterValueKHR, getSemaphoreCounterValueKHR), VK_NULL_FUNC_ENTRY(vkWaitSemaphoresKHR, waitSemaphoresKHR), VK_NULL_FUNC_ENTRY(vkSignalSemaphoreKHR, signalSemaphoreKHR), + VK_NULL_FUNC_ENTRY(vkGetPipelineExecutablePropertiesKHR, getPipelineExecutablePropertiesKHR), + VK_NULL_FUNC_ENTRY(vkGetPipelineExecutableStatisticsKHR, getPipelineExecutableStatisticsKHR), + VK_NULL_FUNC_ENTRY(vkGetPipelineExecutableInternalRepresentationsKHR, getPipelineExecutableInternalRepresentationsKHR), VK_NULL_FUNC_ENTRY(vkDebugMarkerSetObjectTagEXT, debugMarkerSetObjectTagEXT), VK_NULL_FUNC_ENTRY(vkDebugMarkerSetObjectNameEXT, debugMarkerSetObjectNameEXT), VK_NULL_FUNC_ENTRY(vkCmdDebugMarkerBeginEXT, cmdDebugMarkerBeginEXT), diff --git a/external/vulkancts/framework/vulkan/vkStrUtil.inl b/external/vulkancts/framework/vulkan/vkStrUtil.inl index 09218db..8586a53 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtil.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtil.inl @@ -48,8 +48,8 @@ const char* getColorSpaceKHRName (VkColorSpaceKHR value); const char* getPresentModeKHRName (VkPresentModeKHR value); const char* getDriverIdKHRName (VkDriverIdKHR value); const char* getShaderFloatControlsIndependenceKHRName (VkShaderFloatControlsIndependenceKHR value); -const char* getPipelineExecutableStatisticFormatKHRName (VkPipelineExecutableStatisticFormatKHR value); const char* getSemaphoreTypeKHRName (VkSemaphoreTypeKHR value); +const char* getPipelineExecutableStatisticFormatKHRName (VkPipelineExecutableStatisticFormatKHR value); const char* getDebugReportObjectTypeEXTName (VkDebugReportObjectTypeEXT value); const char* getRasterizationOrderAMDName (VkRasterizationOrderAMD value); const char* getShaderInfoTypeAMDName (VkShaderInfoTypeAMD value); @@ -136,8 +136,8 @@ inline tcu::Format::Enum getColorSpaceKHRStr (V inline tcu::Format::Enum getPresentModeKHRStr (VkPresentModeKHR value) { return tcu::Format::Enum(getPresentModeKHRName, value); } inline tcu::Format::Enum getDriverIdKHRStr (VkDriverIdKHR value) { return tcu::Format::Enum(getDriverIdKHRName, value); } inline tcu::Format::Enum getShaderFloatControlsIndependenceKHRStr (VkShaderFloatControlsIndependenceKHR value) { return tcu::Format::Enum(getShaderFloatControlsIndependenceKHRName, value); } -inline tcu::Format::Enum getPipelineExecutableStatisticFormatKHRStr (VkPipelineExecutableStatisticFormatKHR value) { return tcu::Format::Enum(getPipelineExecutableStatisticFormatKHRName, value); } inline tcu::Format::Enum getSemaphoreTypeKHRStr (VkSemaphoreTypeKHR value) { return tcu::Format::Enum(getSemaphoreTypeKHRName, value); } +inline tcu::Format::Enum getPipelineExecutableStatisticFormatKHRStr (VkPipelineExecutableStatisticFormatKHR value) { return tcu::Format::Enum(getPipelineExecutableStatisticFormatKHRName, value); } inline tcu::Format::Enum getDebugReportObjectTypeEXTStr (VkDebugReportObjectTypeEXT value) { return tcu::Format::Enum(getDebugReportObjectTypeEXTName, value); } inline tcu::Format::Enum getRasterizationOrderAMDStr (VkRasterizationOrderAMD value) { return tcu::Format::Enum(getRasterizationOrderAMDName, value); } inline tcu::Format::Enum getShaderInfoTypeAMDStr (VkShaderInfoTypeAMD value) { return tcu::Format::Enum(getShaderInfoTypeAMDName, value); } @@ -224,8 +224,8 @@ inline std::ostream& operator<< (std::ostream& s, VkColorSpaceKHR value) inline std::ostream& operator<< (std::ostream& s, VkPresentModeKHR value) { return s << getPresentModeKHRStr(value); } inline std::ostream& operator<< (std::ostream& s, VkDriverIdKHR value) { return s << getDriverIdKHRStr(value); } inline std::ostream& operator<< (std::ostream& s, VkShaderFloatControlsIndependenceKHR value) { return s << getShaderFloatControlsIndependenceKHRStr(value); } -inline std::ostream& operator<< (std::ostream& s, VkPipelineExecutableStatisticFormatKHR value) { return s << getPipelineExecutableStatisticFormatKHRStr(value); } inline std::ostream& operator<< (std::ostream& s, VkSemaphoreTypeKHR value) { return s << getSemaphoreTypeKHRStr(value); } +inline std::ostream& operator<< (std::ostream& s, VkPipelineExecutableStatisticFormatKHR value) { return s << getPipelineExecutableStatisticFormatKHRStr(value); } inline std::ostream& operator<< (std::ostream& s, VkDebugReportObjectTypeEXT value) { return s << getDebugReportObjectTypeEXTStr(value); } inline std::ostream& operator<< (std::ostream& s, VkRasterizationOrderAMD value) { return s << getRasterizationOrderAMDStr(value); } inline std::ostream& operator<< (std::ostream& s, VkShaderInfoTypeAMD value) { return s << getShaderInfoTypeAMDStr(value); } @@ -616,11 +616,18 @@ std::ostream& operator<< (std::ostream& s, const VkImageFormatListCreateInfoKHR& std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDevice8BitStorageFeaturesKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderAtomicInt64FeaturesKHR& value); +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderClockFeaturesKHR& value); std::ostream& operator<< (std::ostream& s, const VkConformanceVersionKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceDriverPropertiesKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceFloatControlsPropertiesKHR& value); std::ostream& operator<< (std::ostream& s, const VkSubpassDescriptionDepthStencilResolveKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceDepthStencilResolvePropertiesKHR& value); +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR& value); +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphorePropertiesKHR& value); +std::ostream& operator<< (std::ostream& s, const VkSemaphoreTypeCreateInfoKHR& value); +std::ostream& operator<< (std::ostream& s, const VkTimelineSemaphoreSubmitInfoKHR& value); +std::ostream& operator<< (std::ostream& s, const VkSemaphoreWaitInfoKHR& value); +std::ostream& operator<< (std::ostream& s, const VkSemaphoreSignalInfoKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceVulkanMemoryModelFeaturesKHR& value); std::ostream& operator<< (std::ostream& s, const VkSurfaceProtectedCapabilitiesKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceUniformBufferStandardLayoutFeaturesKHR& value); @@ -631,12 +638,6 @@ std::ostream& operator<< (std::ostream& s, const VkPipelineExecutableInfoKHR& va std::ostream& operator<< (std::ostream& s, const VkPipelineExecutableStatisticValueKHR& value); std::ostream& operator<< (std::ostream& s, const VkPipelineExecutableStatisticKHR& value); std::ostream& operator<< (std::ostream& s, const VkPipelineExecutableInternalRepresentationKHR& value); -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR& value); -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphorePropertiesKHR& value); -std::ostream& operator<< (std::ostream& s, const VkSemaphoreTypeCreateInfoKHR& value); -std::ostream& operator<< (std::ostream& s, const VkTimelineSemaphoreSubmitInfoKHR& value); -std::ostream& operator<< (std::ostream& s, const VkSemaphoreWaitInfoKHR& value); -std::ostream& operator<< (std::ostream& s, const VkSemaphoreSignalInfoKHR& value); std::ostream& operator<< (std::ostream& s, const VkDebugReportCallbackCreateInfoEXT& value); std::ostream& operator<< (std::ostream& s, const VkPipelineRasterizationStateRasterizationOrderAMD& value); std::ostream& operator<< (std::ostream& s, const VkDebugMarkerObjectNameInfoEXT& value); @@ -725,7 +726,6 @@ std::ostream& operator<< (std::ostream& s, const VkPipelineCoverageToColorStateC std::ostream& operator<< (std::ostream& s, const VkPipelineCoverageModulationStateCreateInfoNV& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderSMBuiltinsPropertiesNV& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderSMBuiltinsFeaturesNV& value); -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderClockFeaturesKHR& value); std::ostream& operator<< (std::ostream& s, const VkDrmFormatModifierPropertiesEXT& value); std::ostream& operator<< (std::ostream& s, const VkDrmFormatModifierPropertiesListEXT& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceImageDrmFormatModifierInfoEXT& value); diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl index 125ddc8..b11daf5 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl @@ -414,8 +414,8 @@ const char* getStructureTypeName (VkStructureType value) case VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT: return "VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR"; - case VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD: return "VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR"; + case VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD: return "VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD"; case VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT: return "VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD"; case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD: return "VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD"; @@ -1474,6 +1474,17 @@ const char* getShaderFloatControlsIndependenceKHRName (VkShaderFloatControlsInde } } +const char* getSemaphoreTypeKHRName (VkSemaphoreTypeKHR value) +{ + switch (value) + { + case VK_SEMAPHORE_TYPE_BINARY_KHR: return "VK_SEMAPHORE_TYPE_BINARY_KHR"; + case VK_SEMAPHORE_TYPE_TIMELINE_KHR: return "VK_SEMAPHORE_TYPE_TIMELINE_KHR"; + case VK_SEMAPHORE_TYPE_MAX_ENUM_KHR: return "VK_SEMAPHORE_TYPE_MAX_ENUM_KHR"; + default: return DE_NULL; + } +} + const char* getPipelineExecutableStatisticFormatKHRName (VkPipelineExecutableStatisticFormatKHR value) { switch (value) @@ -1487,17 +1498,6 @@ const char* getPipelineExecutableStatisticFormatKHRName (VkPipelineExecutableSta } } -const char* getSemaphoreTypeKHRName (VkSemaphoreTypeKHR value) -{ - switch (value) - { - case VK_SEMAPHORE_TYPE_BINARY_KHR: return "VK_SEMAPHORE_TYPE_BINARY_KHR"; - case VK_SEMAPHORE_TYPE_TIMELINE_KHR: return "VK_SEMAPHORE_TYPE_TIMELINE_KHR"; - case VK_SEMAPHORE_TYPE_MAX_ENUM_KHR: return "VK_SEMAPHORE_TYPE_MAX_ENUM_KHR"; - default: return DE_NULL; - } -} - const char* getDebugReportObjectTypeEXTName (VkDebugReportObjectTypeEXT value) { switch (value) @@ -6234,6 +6234,17 @@ std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderAtomicInt return s; } +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderClockFeaturesKHR& value) +{ + s << "VkPhysicalDeviceShaderClockFeaturesKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tshaderSubgroupClock = " << value.shaderSubgroupClock << '\n'; + s << "\tshaderDeviceClock = " << value.shaderDeviceClock << '\n'; + s << '}'; + return s; +} + std::ostream& operator<< (std::ostream& s, const VkConformanceVersionKHR& value) { s << "VkConformanceVersionKHR = {\n"; @@ -6309,6 +6320,74 @@ std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceDepthStencilRes return s; } +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR& value) +{ + s << "VkPhysicalDeviceTimelineSemaphoreFeaturesKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\ttimelineSemaphore = " << value.timelineSemaphore << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphorePropertiesKHR& value) +{ + s << "VkPhysicalDeviceTimelineSemaphorePropertiesKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tmaxTimelineSemaphoreValueDifference = " << value.maxTimelineSemaphoreValueDifference << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkSemaphoreTypeCreateInfoKHR& value) +{ + s << "VkSemaphoreTypeCreateInfoKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tsemaphoreType = " << value.semaphoreType << '\n'; + s << "\tinitialValue = " << value.initialValue << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkTimelineSemaphoreSubmitInfoKHR& value) +{ + s << "VkTimelineSemaphoreSubmitInfoKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\twaitSemaphoreValueCount = " << value.waitSemaphoreValueCount << '\n'; + s << "\tpWaitSemaphoreValues = " << value.pWaitSemaphoreValues << '\n'; + s << "\tsignalSemaphoreValueCount = " << value.signalSemaphoreValueCount << '\n'; + s << "\tpSignalSemaphoreValues = " << value.pSignalSemaphoreValues << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkSemaphoreWaitInfoKHR& value) +{ + s << "VkSemaphoreWaitInfoKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tflags = " << getSemaphoreWaitFlagsKHRStr(value.flags) << '\n'; + s << "\tsemaphoreCount = " << value.semaphoreCount << '\n'; + s << "\tpSemaphores = " << value.pSemaphores << '\n'; + s << "\tpValues = " << value.pValues << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkSemaphoreSignalInfoKHR& value) +{ + s << "VkSemaphoreSignalInfoKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tsemaphore = " << value.semaphore << '\n'; + s << "\tvalue = " << value.value << '\n'; + s << '}'; + return s; +} + std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceVulkanMemoryModelFeaturesKHR& value) { s << "VkPhysicalDeviceVulkanMemoryModelFeaturesKHR = {\n"; @@ -6423,74 +6502,6 @@ std::ostream& operator<< (std::ostream& s, const VkPipelineExecutableInternalRep return s; } -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR& value) -{ - s << "VkPhysicalDeviceTimelineSemaphoreFeaturesKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\ttimelineSemaphore = " << value.timelineSemaphore << '\n'; - s << '}'; - return s; -} - -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceTimelineSemaphorePropertiesKHR& value) -{ - s << "VkPhysicalDeviceTimelineSemaphorePropertiesKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\tmaxTimelineSemaphoreValueDifference = " << value.maxTimelineSemaphoreValueDifference << '\n'; - s << '}'; - return s; -} - -std::ostream& operator<< (std::ostream& s, const VkSemaphoreTypeCreateInfoKHR& value) -{ - s << "VkSemaphoreTypeCreateInfoKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\tsemaphoreType = " << value.semaphoreType << '\n'; - s << "\tinitialValue = " << value.initialValue << '\n'; - s << '}'; - return s; -} - -std::ostream& operator<< (std::ostream& s, const VkTimelineSemaphoreSubmitInfoKHR& value) -{ - s << "VkTimelineSemaphoreSubmitInfoKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\twaitSemaphoreValueCount = " << value.waitSemaphoreValueCount << '\n'; - s << "\tpWaitSemaphoreValues = " << value.pWaitSemaphoreValues << '\n'; - s << "\tsignalSemaphoreValueCount = " << value.signalSemaphoreValueCount << '\n'; - s << "\tpSignalSemaphoreValues = " << value.pSignalSemaphoreValues << '\n'; - s << '}'; - return s; -} - -std::ostream& operator<< (std::ostream& s, const VkSemaphoreWaitInfoKHR& value) -{ - s << "VkSemaphoreWaitInfoKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\tflags = " << getSemaphoreWaitFlagsKHRStr(value.flags) << '\n'; - s << "\tsemaphoreCount = " << value.semaphoreCount << '\n'; - s << "\tpSemaphores = " << value.pSemaphores << '\n'; - s << "\tpValues = " << value.pValues << '\n'; - s << '}'; - return s; -} - -std::ostream& operator<< (std::ostream& s, const VkSemaphoreSignalInfoKHR& value) -{ - s << "VkSemaphoreSignalInfoKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\tsemaphore = " << value.semaphore << '\n'; - s << "\tvalue = " << value.value << '\n'; - s << '}'; - return s; -} - std::ostream& operator<< (std::ostream& s, const VkDebugReportCallbackCreateInfoEXT& value) { s << "VkDebugReportCallbackCreateInfoEXT = {\n"; @@ -7517,17 +7528,6 @@ std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderSMBuiltin return s; } -std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceShaderClockFeaturesKHR& value) -{ - s << "VkPhysicalDeviceShaderClockFeaturesKHR = {\n"; - s << "\tsType = " << value.sType << '\n'; - s << "\tpNext = " << value.pNext << '\n'; - s << "\tshaderSubgroupClock = " << value.shaderSubgroupClock << '\n'; - s << "\tshaderDeviceClock = " << value.shaderDeviceClock << '\n'; - s << '}'; - return s; -} - std::ostream& operator<< (std::ostream& s, const VkDrmFormatModifierPropertiesEXT& value) { s << "VkDrmFormatModifierPropertiesEXT = {\n"; diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index 22da4e1..d30d6ab 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -2234,6 +2234,14 @@ struct VkPhysicalDeviceShaderAtomicInt64FeaturesKHR VkBool32 shaderSharedInt64Atomics; }; +struct VkPhysicalDeviceShaderClockFeaturesKHR +{ + VkStructureType sType; + void* pNext; + VkBool32 shaderSubgroupClock; + VkBool32 shaderDeviceClock; +}; + struct VkConformanceVersionKHR { deUint8 major; @@ -2294,6 +2302,56 @@ struct VkPhysicalDeviceDepthStencilResolvePropertiesKHR VkBool32 independentResolve; }; +struct VkPhysicalDeviceTimelineSemaphoreFeaturesKHR +{ + VkStructureType sType; + void* pNext; + VkBool32 timelineSemaphore; +}; + +struct VkPhysicalDeviceTimelineSemaphorePropertiesKHR +{ + VkStructureType sType; + void* pNext; + deUint64 maxTimelineSemaphoreValueDifference; +}; + +struct VkSemaphoreTypeCreateInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkSemaphoreTypeKHR semaphoreType; + deUint64 initialValue; +}; + +struct VkTimelineSemaphoreSubmitInfoKHR +{ + VkStructureType sType; + const void* pNext; + deUint32 waitSemaphoreValueCount; + const deUint64* pWaitSemaphoreValues; + deUint32 signalSemaphoreValueCount; + const deUint64* pSignalSemaphoreValues; +}; + +struct VkSemaphoreWaitInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkSemaphoreWaitFlagsKHR flags; + deUint32 semaphoreCount; + const VkSemaphore* pSemaphores; + const deUint64* pValues; +}; + +struct VkSemaphoreSignalInfoKHR +{ + VkStructureType sType; + const void* pNext; + VkSemaphore semaphore; + deUint64 value; +}; + struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR { VkStructureType sType; @@ -2378,56 +2436,6 @@ struct VkPipelineExecutableInternalRepresentationKHR void* pData; }; -struct VkPhysicalDeviceTimelineSemaphoreFeaturesKHR -{ - VkStructureType sType; - void* pNext; - VkBool32 timelineSemaphore; -}; - -struct VkPhysicalDeviceTimelineSemaphorePropertiesKHR -{ - VkStructureType sType; - void* pNext; - deUint64 maxTimelineSemaphoreValueDifference; -}; - -struct VkSemaphoreTypeCreateInfoKHR -{ - VkStructureType sType; - const void* pNext; - VkSemaphoreTypeKHR semaphoreType; - deUint64 initialValue; -}; - -struct VkTimelineSemaphoreSubmitInfoKHR -{ - VkStructureType sType; - const void* pNext; - deUint32 waitSemaphoreValueCount; - const deUint64* pWaitSemaphoreValues; - deUint32 signalSemaphoreValueCount; - const deUint64* pSignalSemaphoreValues; -}; - -struct VkSemaphoreWaitInfoKHR -{ - VkStructureType sType; - const void* pNext; - VkSemaphoreWaitFlagsKHR flags; - deUint32 semaphoreCount; - const VkSemaphore* pSemaphores; - const deUint64* pValues; -}; - -struct VkSemaphoreSignalInfoKHR -{ - VkStructureType sType; - const void* pNext; - VkSemaphore semaphore; - deUint64 value; -}; - struct VkDebugReportCallbackCreateInfoEXT { VkStructureType sType; @@ -3190,14 +3198,6 @@ struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV VkBool32 shaderSMBuiltins; }; -struct VkPhysicalDeviceShaderClockFeaturesKHR -{ - VkStructureType sType; - void* pNext; - VkBool32 shaderSubgroupClock; - VkBool32 shaderDeviceClock; -}; - struct VkDrmFormatModifierPropertiesEXT { deUint64 drmFormatModifier; diff --git a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl index 07fcf0e..3e34486 100644 --- a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl @@ -162,12 +162,12 @@ virtual VkResult importFenceFdKHR (VkDevice device, const VkImportFence virtual VkResult getFenceFdKHR (VkDevice device, const VkFenceGetFdInfoKHR* pGetFdInfo, int* pFd) const = 0; virtual void cmdDrawIndirectCountKHR (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0; virtual void cmdDrawIndexedIndirectCountKHR (VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, deUint32 maxDrawCount, deUint32 stride) const = 0; -virtual VkResult getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const = 0; -virtual VkResult getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const = 0; -virtual VkResult getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const = 0; virtual VkResult getSemaphoreCounterValueKHR (VkDevice device, VkSemaphore semaphore, deUint64* pValue) const = 0; virtual VkResult waitSemaphoresKHR (VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout) const = 0; virtual VkResult signalSemaphoreKHR (VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo) const = 0; +virtual VkResult getPipelineExecutablePropertiesKHR (VkDevice device, const VkPipelineInfoKHR* pPipelineInfo, deUint32* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const = 0; +virtual VkResult getPipelineExecutableStatisticsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pStatisticCount, VkPipelineExecutableStatisticKHR* pStatistics) const = 0; +virtual VkResult getPipelineExecutableInternalRepresentationsKHR (VkDevice device, const VkPipelineExecutableInfoKHR* pExecutableInfo, deUint32* pInternalRepresentationCount, VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations) const = 0; virtual VkResult debugMarkerSetObjectTagEXT (VkDevice device, const VkDebugMarkerObjectTagInfoEXT* pTagInfo) const = 0; virtual VkResult debugMarkerSetObjectNameEXT (VkDevice device, const VkDebugMarkerObjectNameInfoEXT* pNameInfo) const = 0; virtual void cmdDebugMarkerBeginEXT (VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) const = 0; diff --git a/external/vulkancts/framework/vulkan/vkVulkan_c.inl b/external/vulkancts/framework/vulkan/vkVulkan_c.inl index b315f64..e18b694 100644 --- a/external/vulkancts/framework/vulkan/vkVulkan_c.inl +++ b/external/vulkancts/framework/vulkan/vkVulkan_c.inl @@ -47,7 +47,7 @@ extern "C" { #define VK_VERSION_MINOR(version) (((deUint32)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((deUint32)(version) & 0xfff) // Version of this file -#define VK_HEADER_VERSION 123 +#define VK_HEADER_VERSION 124 #define VK_NULL_HANDLE 0 @@ -452,8 +452,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, - VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR = 1000181000, + VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT = 1000184000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, @@ -6248,6 +6248,18 @@ typedef struct VkPhysicalDeviceShaderAtomicInt64FeaturesKHR { +#define VK_KHR_shader_clock 1 +#define VK_KHR_SHADER_CLOCK_SPEC_VERSION 1 +#define VK_KHR_SHADER_CLOCK_EXTENSION_NAME "VK_KHR_shader_clock" +typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderSubgroupClock; + VkBool32 shaderDeviceClock; +} VkPhysicalDeviceShaderClockFeaturesKHR; + + + #define VK_KHR_driver_properties 1 #define VK_MAX_DRIVER_NAME_SIZE_KHR 256 #define VK_MAX_DRIVER_INFO_SIZE_KHR 256 @@ -6364,6 +6376,89 @@ typedef struct VkPhysicalDeviceDepthStencilResolvePropertiesKHR { #define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME "VK_KHR_swapchain_mutable_format" +#define VK_KHR_timeline_semaphore 1 +#define VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION 2 +#define VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME "VK_KHR_timeline_semaphore" + +typedef enum VkSemaphoreTypeKHR { + VK_SEMAPHORE_TYPE_BINARY_KHR = 0, + VK_SEMAPHORE_TYPE_TIMELINE_KHR = 1, + VK_SEMAPHORE_TYPE_BEGIN_RANGE_KHR = VK_SEMAPHORE_TYPE_BINARY_KHR, + VK_SEMAPHORE_TYPE_END_RANGE_KHR = VK_SEMAPHORE_TYPE_TIMELINE_KHR, + VK_SEMAPHORE_TYPE_RANGE_SIZE_KHR = (VK_SEMAPHORE_TYPE_TIMELINE_KHR - VK_SEMAPHORE_TYPE_BINARY_KHR + 1), + VK_SEMAPHORE_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF +} VkSemaphoreTypeKHR; + +typedef enum VkSemaphoreWaitFlagBitsKHR { + VK_SEMAPHORE_WAIT_ANY_BIT_KHR = 0x00000001, + VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkSemaphoreWaitFlagBitsKHR; +typedef VkFlags VkSemaphoreWaitFlagsKHR; +typedef struct VkPhysicalDeviceTimelineSemaphoreFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 timelineSemaphore; +} VkPhysicalDeviceTimelineSemaphoreFeaturesKHR; + +typedef struct VkPhysicalDeviceTimelineSemaphorePropertiesKHR { + VkStructureType sType; + void* pNext; + deUint64 maxTimelineSemaphoreValueDifference; +} VkPhysicalDeviceTimelineSemaphorePropertiesKHR; + +typedef struct VkSemaphoreTypeCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkSemaphoreTypeKHR semaphoreType; + deUint64 initialValue; +} VkSemaphoreTypeCreateInfoKHR; + +typedef struct VkTimelineSemaphoreSubmitInfoKHR { + VkStructureType sType; + const void* pNext; + deUint32 waitSemaphoreValueCount; + const deUint64* pWaitSemaphoreValues; + deUint32 signalSemaphoreValueCount; + const deUint64* pSignalSemaphoreValues; +} VkTimelineSemaphoreSubmitInfoKHR; + +typedef struct VkSemaphoreWaitInfoKHR { + VkStructureType sType; + const void* pNext; + VkSemaphoreWaitFlagsKHR flags; + deUint32 semaphoreCount; + const VkSemaphore* pSemaphores; + const deUint64* pValues; +} VkSemaphoreWaitInfoKHR; + +typedef struct VkSemaphoreSignalInfoKHR { + VkStructureType sType; + const void* pNext; + VkSemaphore semaphore; + deUint64 value; +} VkSemaphoreSignalInfoKHR; + +typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreCounterValueKHR)(VkDevice device, VkSemaphore semaphore, deUint64* pValue); +typedef VkResult (VKAPI_PTR *PFN_vkWaitSemaphoresKHR)(VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout); +typedef VkResult (VKAPI_PTR *PFN_vkSignalSemaphoreKHR)(VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValueKHR( + VkDevice device, + VkSemaphore semaphore, + deUint64* pValue); + +VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphoresKHR( + VkDevice device, + const VkSemaphoreWaitInfoKHR* pWaitInfo, + deUint64 timeout); + +VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphoreKHR( + VkDevice device, + const VkSemaphoreSignalInfoKHR* pSignalInfo); +#endif + + #define VK_KHR_vulkan_memory_model 1 #define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 3 #define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model" @@ -6492,89 +6587,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableInternalRepresentationsKHR #endif -#define VK_KHR_timeline_semaphore 1 -#define VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION 2 -#define VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME "VK_KHR_timeline_semaphore" - -typedef enum VkSemaphoreTypeKHR { - VK_SEMAPHORE_TYPE_BINARY_KHR = 0, - VK_SEMAPHORE_TYPE_TIMELINE_KHR = 1, - VK_SEMAPHORE_TYPE_BEGIN_RANGE_KHR = VK_SEMAPHORE_TYPE_BINARY_KHR, - VK_SEMAPHORE_TYPE_END_RANGE_KHR = VK_SEMAPHORE_TYPE_TIMELINE_KHR, - VK_SEMAPHORE_TYPE_RANGE_SIZE_KHR = (VK_SEMAPHORE_TYPE_TIMELINE_KHR - VK_SEMAPHORE_TYPE_BINARY_KHR + 1), - VK_SEMAPHORE_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF -} VkSemaphoreTypeKHR; - -typedef enum VkSemaphoreWaitFlagBitsKHR { - VK_SEMAPHORE_WAIT_ANY_BIT_KHR = 0x00000001, - VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkSemaphoreWaitFlagBitsKHR; -typedef VkFlags VkSemaphoreWaitFlagsKHR; -typedef struct VkPhysicalDeviceTimelineSemaphoreFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 timelineSemaphore; -} VkPhysicalDeviceTimelineSemaphoreFeaturesKHR; - -typedef struct VkPhysicalDeviceTimelineSemaphorePropertiesKHR { - VkStructureType sType; - void* pNext; - deUint64 maxTimelineSemaphoreValueDifference; -} VkPhysicalDeviceTimelineSemaphorePropertiesKHR; - -typedef struct VkSemaphoreTypeCreateInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphoreTypeKHR semaphoreType; - deUint64 initialValue; -} VkSemaphoreTypeCreateInfoKHR; - -typedef struct VkTimelineSemaphoreSubmitInfoKHR { - VkStructureType sType; - const void* pNext; - deUint32 waitSemaphoreValueCount; - const deUint64* pWaitSemaphoreValues; - deUint32 signalSemaphoreValueCount; - const deUint64* pSignalSemaphoreValues; -} VkTimelineSemaphoreSubmitInfoKHR; - -typedef struct VkSemaphoreWaitInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphoreWaitFlagsKHR flags; - deUint32 semaphoreCount; - const VkSemaphore* pSemaphores; - const deUint64* pValues; -} VkSemaphoreWaitInfoKHR; - -typedef struct VkSemaphoreSignalInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphore semaphore; - deUint64 value; -} VkSemaphoreSignalInfoKHR; - -typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreCounterValueKHR)(VkDevice device, VkSemaphore semaphore, deUint64* pValue); -typedef VkResult (VKAPI_PTR *PFN_vkWaitSemaphoresKHR)(VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, deUint64 timeout); -typedef VkResult (VKAPI_PTR *PFN_vkSignalSemaphoreKHR)(VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo); - -#ifndef VK_NO_PROTOTYPES -VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValueKHR( - VkDevice device, - VkSemaphore semaphore, - deUint64* pValue); - -VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphoresKHR( - VkDevice device, - const VkSemaphoreWaitInfoKHR* pWaitInfo, - deUint64 timeout); - -VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphoreKHR( - VkDevice device, - const VkSemaphoreSignalInfoKHR* pSignalInfo); -#endif - - #define VK_EXT_debug_report 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT) #define VK_EXT_DEBUG_REPORT_SPEC_VERSION 9 @@ -8208,6 +8220,8 @@ typedef struct VkPipelineCoverageModulationStateCreateInfoNV { const float* pCoverageModulationTable; } VkPipelineCoverageModulationStateCreateInfoNV; + + #define VK_NV_fill_rectangle 1 #define VK_NV_FILL_RECTANGLE_SPEC_VERSION 1 #define VK_NV_FILL_RECTANGLE_EXTENSION_NAME "VK_NV_fill_rectangle" @@ -8235,16 +8249,6 @@ typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV { #define VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION 1 #define VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME "VK_EXT_post_depth_coverage" -#define VK_KHR_shader_clock 1 -#define VK_KHR_SHADER_CLOCK_SPEC_VERSION 1 -#define VK_KHR_SHADER_CLOCK_EXTENSION_NAME "VK_KHR_shader_clock" - -typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderSubgroupClock; - VkBool32 shaderDeviceClock; -} VkPhysicalDeviceShaderClockFeaturesKHR; #define VK_EXT_image_drm_format_modifier 1 #define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 1 diff --git a/external/vulkancts/scripts/gen_ext_deps.py b/external/vulkancts/scripts/gen_ext_deps.py index 5a5d590..9612297 100644 --- a/external/vulkancts/scripts/gen_ext_deps.py +++ b/external/vulkancts/scripts/gen_ext_deps.py @@ -32,8 +32,8 @@ from collections import defaultdict VK_SOURCE = khr_util.registry_cache.RegistrySource( "https://github.com/KhronosGroup/Vulkan-Docs.git", "xml/vk.xml", - "c5261decf68cb2ef8cd934b8a3e4824bfde81cda", - "e301b17d23373eb0309b250dcf528eccd53a9aa6f9ce686c465ec6eb9e60f8e3") + "22a5a1459fbe8be546079525c4c9d50bfc20b30b", + "26b7945a5fd040e3a3adc578d8ff786d09a7cfeeb48ff1e62aeea8b8cb34fb5b") VK_INL_FILE = os.path.join(os.path.dirname(__file__), "..", "framework", "vulkan", "vkApiExtensionDependencyInfo.inl") VK_INL_HEADER = khr_util.format.genInlHeader("Khronos Vulkan API description (vk.xml)", VK_SOURCE.getRevision()) diff --git a/external/vulkancts/scripts/src/vulkan_core.h b/external/vulkancts/scripts/src/vulkan_core.h index e225e52..4cf54f4 100644 --- a/external/vulkancts/scripts/src/vulkan_core.h +++ b/external/vulkancts/scripts/src/vulkan_core.h @@ -44,7 +44,7 @@ extern "C" { #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) // Version of this file -#define VK_HEADER_VERSION 123 +#define VK_HEADER_VERSION 124 #define VK_NULL_HANDLE 0 @@ -449,8 +449,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, - VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CLOCK_FEATURES_KHR = 1000181000, + VK_STRUCTURE_TYPE_PIPELINE_COMPILER_CONTROL_CREATE_INFO_AMD = 1000183000, VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT = 1000184000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, @@ -6245,6 +6245,18 @@ typedef struct VkPhysicalDeviceShaderAtomicInt64FeaturesKHR { +#define VK_KHR_shader_clock 1 +#define VK_KHR_SHADER_CLOCK_SPEC_VERSION 1 +#define VK_KHR_SHADER_CLOCK_EXTENSION_NAME "VK_KHR_shader_clock" +typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 shaderSubgroupClock; + VkBool32 shaderDeviceClock; +} VkPhysicalDeviceShaderClockFeaturesKHR; + + + #define VK_KHR_driver_properties 1 #define VK_MAX_DRIVER_NAME_SIZE_KHR 256 #define VK_MAX_DRIVER_INFO_SIZE_KHR 256 @@ -6361,6 +6373,89 @@ typedef struct VkPhysicalDeviceDepthStencilResolvePropertiesKHR { #define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME "VK_KHR_swapchain_mutable_format" +#define VK_KHR_timeline_semaphore 1 +#define VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION 2 +#define VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME "VK_KHR_timeline_semaphore" + +typedef enum VkSemaphoreTypeKHR { + VK_SEMAPHORE_TYPE_BINARY_KHR = 0, + VK_SEMAPHORE_TYPE_TIMELINE_KHR = 1, + VK_SEMAPHORE_TYPE_BEGIN_RANGE_KHR = VK_SEMAPHORE_TYPE_BINARY_KHR, + VK_SEMAPHORE_TYPE_END_RANGE_KHR = VK_SEMAPHORE_TYPE_TIMELINE_KHR, + VK_SEMAPHORE_TYPE_RANGE_SIZE_KHR = (VK_SEMAPHORE_TYPE_TIMELINE_KHR - VK_SEMAPHORE_TYPE_BINARY_KHR + 1), + VK_SEMAPHORE_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF +} VkSemaphoreTypeKHR; + +typedef enum VkSemaphoreWaitFlagBitsKHR { + VK_SEMAPHORE_WAIT_ANY_BIT_KHR = 0x00000001, + VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF +} VkSemaphoreWaitFlagBitsKHR; +typedef VkFlags VkSemaphoreWaitFlagsKHR; +typedef struct VkPhysicalDeviceTimelineSemaphoreFeaturesKHR { + VkStructureType sType; + void* pNext; + VkBool32 timelineSemaphore; +} VkPhysicalDeviceTimelineSemaphoreFeaturesKHR; + +typedef struct VkPhysicalDeviceTimelineSemaphorePropertiesKHR { + VkStructureType sType; + void* pNext; + uint64_t maxTimelineSemaphoreValueDifference; +} VkPhysicalDeviceTimelineSemaphorePropertiesKHR; + +typedef struct VkSemaphoreTypeCreateInfoKHR { + VkStructureType sType; + const void* pNext; + VkSemaphoreTypeKHR semaphoreType; + uint64_t initialValue; +} VkSemaphoreTypeCreateInfoKHR; + +typedef struct VkTimelineSemaphoreSubmitInfoKHR { + VkStructureType sType; + const void* pNext; + uint32_t waitSemaphoreValueCount; + const uint64_t* pWaitSemaphoreValues; + uint32_t signalSemaphoreValueCount; + const uint64_t* pSignalSemaphoreValues; +} VkTimelineSemaphoreSubmitInfoKHR; + +typedef struct VkSemaphoreWaitInfoKHR { + VkStructureType sType; + const void* pNext; + VkSemaphoreWaitFlagsKHR flags; + uint32_t semaphoreCount; + const VkSemaphore* pSemaphores; + const uint64_t* pValues; +} VkSemaphoreWaitInfoKHR; + +typedef struct VkSemaphoreSignalInfoKHR { + VkStructureType sType; + const void* pNext; + VkSemaphore semaphore; + uint64_t value; +} VkSemaphoreSignalInfoKHR; + +typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreCounterValueKHR)(VkDevice device, VkSemaphore semaphore, uint64_t* pValue); +typedef VkResult (VKAPI_PTR *PFN_vkWaitSemaphoresKHR)(VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, uint64_t timeout); +typedef VkResult (VKAPI_PTR *PFN_vkSignalSemaphoreKHR)(VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo); + +#ifndef VK_NO_PROTOTYPES +VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValueKHR( + VkDevice device, + VkSemaphore semaphore, + uint64_t* pValue); + +VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphoresKHR( + VkDevice device, + const VkSemaphoreWaitInfoKHR* pWaitInfo, + uint64_t timeout); + +VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphoreKHR( + VkDevice device, + const VkSemaphoreSignalInfoKHR* pSignalInfo); +#endif + + #define VK_KHR_vulkan_memory_model 1 #define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 3 #define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model" @@ -6489,89 +6584,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineExecutableInternalRepresentationsKHR #endif -#define VK_KHR_timeline_semaphore 1 -#define VK_KHR_TIMELINE_SEMAPHORE_SPEC_VERSION 2 -#define VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME "VK_KHR_timeline_semaphore" - -typedef enum VkSemaphoreTypeKHR { - VK_SEMAPHORE_TYPE_BINARY_KHR = 0, - VK_SEMAPHORE_TYPE_TIMELINE_KHR = 1, - VK_SEMAPHORE_TYPE_BEGIN_RANGE_KHR = VK_SEMAPHORE_TYPE_BINARY_KHR, - VK_SEMAPHORE_TYPE_END_RANGE_KHR = VK_SEMAPHORE_TYPE_TIMELINE_KHR, - VK_SEMAPHORE_TYPE_RANGE_SIZE_KHR = (VK_SEMAPHORE_TYPE_TIMELINE_KHR - VK_SEMAPHORE_TYPE_BINARY_KHR + 1), - VK_SEMAPHORE_TYPE_MAX_ENUM_KHR = 0x7FFFFFFF -} VkSemaphoreTypeKHR; - -typedef enum VkSemaphoreWaitFlagBitsKHR { - VK_SEMAPHORE_WAIT_ANY_BIT_KHR = 0x00000001, - VK_SEMAPHORE_WAIT_FLAG_BITS_MAX_ENUM_KHR = 0x7FFFFFFF -} VkSemaphoreWaitFlagBitsKHR; -typedef VkFlags VkSemaphoreWaitFlagsKHR; -typedef struct VkPhysicalDeviceTimelineSemaphoreFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 timelineSemaphore; -} VkPhysicalDeviceTimelineSemaphoreFeaturesKHR; - -typedef struct VkPhysicalDeviceTimelineSemaphorePropertiesKHR { - VkStructureType sType; - void* pNext; - uint64_t maxTimelineSemaphoreValueDifference; -} VkPhysicalDeviceTimelineSemaphorePropertiesKHR; - -typedef struct VkSemaphoreTypeCreateInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphoreTypeKHR semaphoreType; - uint64_t initialValue; -} VkSemaphoreTypeCreateInfoKHR; - -typedef struct VkTimelineSemaphoreSubmitInfoKHR { - VkStructureType sType; - const void* pNext; - uint32_t waitSemaphoreValueCount; - const uint64_t* pWaitSemaphoreValues; - uint32_t signalSemaphoreValueCount; - const uint64_t* pSignalSemaphoreValues; -} VkTimelineSemaphoreSubmitInfoKHR; - -typedef struct VkSemaphoreWaitInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphoreWaitFlagsKHR flags; - uint32_t semaphoreCount; - const VkSemaphore* pSemaphores; - const uint64_t* pValues; -} VkSemaphoreWaitInfoKHR; - -typedef struct VkSemaphoreSignalInfoKHR { - VkStructureType sType; - const void* pNext; - VkSemaphore semaphore; - uint64_t value; -} VkSemaphoreSignalInfoKHR; - -typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreCounterValueKHR)(VkDevice device, VkSemaphore semaphore, uint64_t* pValue); -typedef VkResult (VKAPI_PTR *PFN_vkWaitSemaphoresKHR)(VkDevice device, const VkSemaphoreWaitInfoKHR* pWaitInfo, uint64_t timeout); -typedef VkResult (VKAPI_PTR *PFN_vkSignalSemaphoreKHR)(VkDevice device, const VkSemaphoreSignalInfoKHR* pSignalInfo); - -#ifndef VK_NO_PROTOTYPES -VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreCounterValueKHR( - VkDevice device, - VkSemaphore semaphore, - uint64_t* pValue); - -VKAPI_ATTR VkResult VKAPI_CALL vkWaitSemaphoresKHR( - VkDevice device, - const VkSemaphoreWaitInfoKHR* pWaitInfo, - uint64_t timeout); - -VKAPI_ATTR VkResult VKAPI_CALL vkSignalSemaphoreKHR( - VkDevice device, - const VkSemaphoreSignalInfoKHR* pSignalInfo); -#endif - - #define VK_EXT_debug_report 1 VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT) #define VK_EXT_DEBUG_REPORT_SPEC_VERSION 9 @@ -8205,6 +8217,8 @@ typedef struct VkPipelineCoverageModulationStateCreateInfoNV { const float* pCoverageModulationTable; } VkPipelineCoverageModulationStateCreateInfoNV; + + #define VK_NV_fill_rectangle 1 #define VK_NV_FILL_RECTANGLE_SPEC_VERSION 1 #define VK_NV_FILL_RECTANGLE_EXTENSION_NAME "VK_NV_fill_rectangle" @@ -8232,16 +8246,6 @@ typedef struct VkPhysicalDeviceShaderSMBuiltinsFeaturesNV { #define VK_EXT_POST_DEPTH_COVERAGE_SPEC_VERSION 1 #define VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME "VK_EXT_post_depth_coverage" -#define VK_KHR_shader_clock 1 -#define VK_KHR_SHADER_CLOCK_SPEC_VERSION 1 -#define VK_KHR_SHADER_CLOCK_EXTENSION_NAME "VK_KHR_shader_clock" - -typedef struct VkPhysicalDeviceShaderClockFeaturesKHR { - VkStructureType sType; - void* pNext; - VkBool32 shaderSubgroupClock; - VkBool32 shaderDeviceClock; -} VkPhysicalDeviceShaderClockFeaturesKHR; #define VK_EXT_image_drm_format_modifier 1 #define VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_SPEC_VERSION 1 -- 2.7.4