From 98647c54023f979ca9a1a36b3d4d8609c469e879 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Thu, 29 Jul 2021 17:57:51 -0600 Subject: [PATCH] Updated framework for VK_KHR_maintenance4 This is just the vulkan_core.h and generated framework for VK_KHR_maintenance4. Other CLs can be chained off this one. Affects: nothing Components: Framework, Vulkan VK-GL-CTS issue: 2996 Change-Id: Iaddaaa02c1523181b86f4beeeef40a17128c65bb (cherry picked from commit 3cc3a085593bb7e8e5fa323e2ab2101b1bfc9cc5) --- .../vulkancts/framework/vulkan/vkBasicTypes.inl | 2 ++ .../framework/vulkan/vkConcreteDeviceInterface.inl | 6 ++-- .../framework/vulkan/vkDeviceDriverImpl.inl | 12 ++++---- .../framework/vulkan/vkDeviceFunctionPointers.inl | 6 ++-- .../framework/vulkan/vkExtensionFunctions.inl | 6 ++-- .../framework/vulkan/vkFunctionPointerTypes.inl | 6 ++-- .../framework/vulkan/vkGetStructureTypeImpl.inl | 10 +++++++ .../vulkan/vkInitDeviceFunctionPointers.inl | 6 ++-- .../framework/vulkan/vkNullDriverImpl.inl | 18 ++++++------ external/vulkancts/framework/vulkan/vkStrUtil.inl | 2 ++ .../vulkancts/framework/vulkan/vkStrUtilImpl.inl | 23 +++++++++++++++ .../vulkancts/framework/vulkan/vkStructTypes.inl | 15 ++++++++++ .../framework/vulkan/vkVirtualDeviceInterface.inl | 6 ++-- external/vulkancts/framework/vulkan/vkVulkan_c.inl | 33 ++++++++++++++++------ external/vulkancts/scripts/src/vulkan_core.h | 33 ++++++++++++++++------ 15 files changed, 133 insertions(+), 51 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index eb984cd..ec4c0cd 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -698,6 +698,8 @@ enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = 1000413000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = 1000413001, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = 1000413002, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = 1000413003, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, diff --git a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl index ddd34d6..1122ade 100644 --- a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl @@ -195,9 +195,9 @@ virtual void cmdCopyBufferToImage2KHR (VkCommandBuffer commandBuffer, co virtual void cmdCopyImageToBuffer2KHR (VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo) const; virtual void cmdBlitImage2KHR (VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR* pBlitImageInfo) const; virtual void cmdResolveImage2KHR (VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR* pResolveImageInfo) const; -virtual void getBufferCreateInfoMemoryRequirementsKHR (VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) const; -virtual void getImageCreateInfoMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) const; -virtual void getImageCreateInfoSparseMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const; +virtual void getDeviceBufferMemoryRequirementsKHR (VkDevice device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) const; +virtual void getDeviceImageMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) const; +virtual void getDeviceImageSparseMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) 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 0cc5bae..034071a 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl @@ -972,19 +972,19 @@ void DeviceDriver::cmdResolveImage2KHR (VkCommandBuffer commandBuffer, const VkR m_vk.cmdResolveImage2KHR(commandBuffer, pResolveImageInfo); } -void DeviceDriver::getBufferCreateInfoMemoryRequirementsKHR (VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) const +void DeviceDriver::getDeviceBufferMemoryRequirementsKHR (VkDevice device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) const { - m_vk.getBufferCreateInfoMemoryRequirementsKHR(device, pCreateInfo, pMemoryRequirements); + m_vk.getDeviceBufferMemoryRequirementsKHR(device, pInfo, pMemoryRequirements); } -void DeviceDriver::getImageCreateInfoMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) const +void DeviceDriver::getDeviceImageMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) const { - m_vk.getImageCreateInfoMemoryRequirementsKHR(device, pCreateInfo, pMemoryRequirements); + m_vk.getDeviceImageMemoryRequirementsKHR(device, pInfo, pMemoryRequirements); } -void DeviceDriver::getImageCreateInfoSparseMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const +void DeviceDriver::getDeviceImageSparseMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const { - m_vk.getImageCreateInfoSparseMemoryRequirementsKHR(device, pCreateInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements); + m_vk.getDeviceImageSparseMemoryRequirementsKHR(device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements); } VkResult DeviceDriver::debugMarkerSetObjectTagEXT (VkDevice device, const VkDebugMarkerObjectTagInfoEXT* pTagInfo) const diff --git a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl index 904fbfa..3b3cbd9 100644 --- a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl @@ -195,9 +195,9 @@ CmdCopyBufferToImage2KHRFunc cmdCopyBufferToImage2KHR; CmdCopyImageToBuffer2KHRFunc cmdCopyImageToBuffer2KHR; CmdBlitImage2KHRFunc cmdBlitImage2KHR; CmdResolveImage2KHRFunc cmdResolveImage2KHR; -GetBufferCreateInfoMemoryRequirementsKHRFunc getBufferCreateInfoMemoryRequirementsKHR; -GetImageCreateInfoMemoryRequirementsKHRFunc getImageCreateInfoMemoryRequirementsKHR; -GetImageCreateInfoSparseMemoryRequirementsKHRFunc getImageCreateInfoSparseMemoryRequirementsKHR; +GetDeviceBufferMemoryRequirementsKHRFunc getDeviceBufferMemoryRequirementsKHR; +GetDeviceImageMemoryRequirementsKHRFunc getDeviceImageMemoryRequirementsKHR; +GetDeviceImageSparseMemoryRequirementsKHRFunc getDeviceImageSparseMemoryRequirementsKHR; DebugMarkerSetObjectTagEXTFunc debugMarkerSetObjectTagEXT; DebugMarkerSetObjectNameEXTFunc debugMarkerSetObjectNameEXT; CmdDebugMarkerBeginEXTFunc cmdDebugMarkerBeginEXT; diff --git a/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl b/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl index d43894f..e5ff9e2 100644 --- a/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl +++ b/external/vulkancts/framework/vulkan/vkExtensionFunctions.inl @@ -1476,9 +1476,9 @@ void getDeviceExtensionFunctions (uint32_t apiVersion, ::std::string extName, :: } if (extName == "VK_KHR_maintenance4") { - functions.push_back("vkGetBufferCreateInfoMemoryRequirementsKHR"); - functions.push_back("vkGetImageCreateInfoMemoryRequirementsKHR"); - functions.push_back("vkGetImageCreateInfoSparseMemoryRequirementsKHR"); + functions.push_back("vkGetDeviceBufferMemoryRequirementsKHR"); + functions.push_back("vkGetDeviceImageMemoryRequirementsKHR"); + functions.push_back("vkGetDeviceImageSparseMemoryRequirementsKHR"); return; } if (extName == "VK_EXT_debug_report") diff --git a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl index e68a4c9..192c7bd 100644 --- a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl +++ b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl @@ -283,9 +283,9 @@ typedef VKAPI_ATTR void (VKAPI_CALL* CmdCopyBufferToImage2KHRFunc) typedef VKAPI_ATTR void (VKAPI_CALL* CmdCopyImageToBuffer2KHRFunc) (VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo); typedef VKAPI_ATTR void (VKAPI_CALL* CmdBlitImage2KHRFunc) (VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR* pBlitImageInfo); typedef VKAPI_ATTR void (VKAPI_CALL* CmdResolveImage2KHRFunc) (VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR* pResolveImageInfo); -typedef VKAPI_ATTR void (VKAPI_CALL* GetBufferCreateInfoMemoryRequirementsKHRFunc) (VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef VKAPI_ATTR void (VKAPI_CALL* GetImageCreateInfoMemoryRequirementsKHRFunc) (VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef VKAPI_ATTR void (VKAPI_CALL* GetImageCreateInfoSparseMemoryRequirementsKHRFunc) (VkDevice device, const VkImageCreateInfo* pCreateInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); +typedef VKAPI_ATTR void (VKAPI_CALL* GetDeviceBufferMemoryRequirementsKHRFunc) (VkDevice device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef VKAPI_ATTR void (VKAPI_CALL* GetDeviceImageMemoryRequirementsKHRFunc) (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); +typedef VKAPI_ATTR void (VKAPI_CALL* GetDeviceImageSparseMemoryRequirementsKHRFunc) (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); 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, uint64_t object, size_t location, int32_t messageCode, const char* pLayerPrefix, const char* pMessage); diff --git a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl index 2d3bb30..4f29e39 100644 --- a/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl +++ b/external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl @@ -1226,6 +1226,16 @@ template<> VkStructureType getStructureType VkStructureType getStructureType (void) +{ + return VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR; +} + +template<> VkStructureType getStructureType (void) +{ + return VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR; +} + template<> VkStructureType getStructureType (void) { return VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; diff --git a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl index 423cd1e..53a8a6f 100644 --- a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl +++ b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl @@ -251,9 +251,9 @@ m_vk.cmdCopyBufferToImage2KHR = (CmdCopyBufferToImage2KHRFunc) GET_PR m_vk.cmdCopyImageToBuffer2KHR = (CmdCopyImageToBuffer2KHRFunc) GET_PROC_ADDR("vkCmdCopyImageToBuffer2KHR"); m_vk.cmdBlitImage2KHR = (CmdBlitImage2KHRFunc) GET_PROC_ADDR("vkCmdBlitImage2KHR"); m_vk.cmdResolveImage2KHR = (CmdResolveImage2KHRFunc) GET_PROC_ADDR("vkCmdResolveImage2KHR"); -m_vk.getBufferCreateInfoMemoryRequirementsKHR = (GetBufferCreateInfoMemoryRequirementsKHRFunc) GET_PROC_ADDR("vkGetBufferCreateInfoMemoryRequirementsKHR"); -m_vk.getImageCreateInfoMemoryRequirementsKHR = (GetImageCreateInfoMemoryRequirementsKHRFunc) GET_PROC_ADDR("vkGetImageCreateInfoMemoryRequirementsKHR"); -m_vk.getImageCreateInfoSparseMemoryRequirementsKHR = (GetImageCreateInfoSparseMemoryRequirementsKHRFunc) GET_PROC_ADDR("vkGetImageCreateInfoSparseMemoryRequirementsKHR"); +m_vk.getDeviceBufferMemoryRequirementsKHR = (GetDeviceBufferMemoryRequirementsKHRFunc) GET_PROC_ADDR("vkGetDeviceBufferMemoryRequirementsKHR"); +m_vk.getDeviceImageMemoryRequirementsKHR = (GetDeviceImageMemoryRequirementsKHRFunc) GET_PROC_ADDR("vkGetDeviceImageMemoryRequirementsKHR"); +m_vk.getDeviceImageSparseMemoryRequirementsKHR = (GetDeviceImageSparseMemoryRequirementsKHRFunc) GET_PROC_ADDR("vkGetDeviceImageSparseMemoryRequirementsKHR"); 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 6b26df4..f363363 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl +++ b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl @@ -1855,24 +1855,24 @@ VKAPI_ATTR void VKAPI_CALL cmdResolveImage2KHR (VkCommandBuffer commandBuffer, c DE_UNREF(pResolveImageInfo); } -VKAPI_ATTR void VKAPI_CALL getBufferCreateInfoMemoryRequirementsKHR (VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) +VKAPI_ATTR void VKAPI_CALL getDeviceBufferMemoryRequirementsKHR (VkDevice device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) { DE_UNREF(device); - DE_UNREF(pCreateInfo); + DE_UNREF(pInfo); DE_UNREF(pMemoryRequirements); } -VKAPI_ATTR void VKAPI_CALL getImageCreateInfoMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) +VKAPI_ATTR void VKAPI_CALL getDeviceImageMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) { DE_UNREF(device); - DE_UNREF(pCreateInfo); + DE_UNREF(pInfo); DE_UNREF(pMemoryRequirements); } -VKAPI_ATTR void VKAPI_CALL getImageCreateInfoSparseMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) +VKAPI_ATTR void VKAPI_CALL getDeviceImageSparseMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) { DE_UNREF(device); - DE_UNREF(pCreateInfo); + DE_UNREF(pInfo); DE_UNREF(pSparseMemoryRequirementCount); DE_UNREF(pSparseMemoryRequirements); } @@ -3575,9 +3575,9 @@ static const tcu::StaticFunctionLibrary::Entry s_deviceFunctions[] = VK_NULL_FUNC_ENTRY(vkCmdCopyImageToBuffer2KHR, cmdCopyImageToBuffer2KHR), VK_NULL_FUNC_ENTRY(vkCmdBlitImage2KHR, cmdBlitImage2KHR), VK_NULL_FUNC_ENTRY(vkCmdResolveImage2KHR, cmdResolveImage2KHR), - VK_NULL_FUNC_ENTRY(vkGetBufferCreateInfoMemoryRequirementsKHR, getBufferCreateInfoMemoryRequirementsKHR), - VK_NULL_FUNC_ENTRY(vkGetImageCreateInfoMemoryRequirementsKHR, getImageCreateInfoMemoryRequirementsKHR), - VK_NULL_FUNC_ENTRY(vkGetImageCreateInfoSparseMemoryRequirementsKHR, getImageCreateInfoSparseMemoryRequirementsKHR), + VK_NULL_FUNC_ENTRY(vkGetDeviceBufferMemoryRequirementsKHR, getDeviceBufferMemoryRequirementsKHR), + VK_NULL_FUNC_ENTRY(vkGetDeviceImageMemoryRequirementsKHR, getDeviceImageMemoryRequirementsKHR), + VK_NULL_FUNC_ENTRY(vkGetDeviceImageSparseMemoryRequirementsKHR, getDeviceImageSparseMemoryRequirementsKHR), 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 115c2fb..c2fb362 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtil.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtil.inl @@ -826,6 +826,8 @@ std::ostream& operator<< (std::ostream& s, const VkResolveImageInfo2KHR& value); std::ostream& operator<< (std::ostream& s, const VkFormatPropertiesExtendedKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceMaintenance4FeaturesKHR& value); std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceMaintenance4PropertiesKHR& value); +std::ostream& operator<< (std::ostream& s, const VkDeviceBufferMemoryRequirementsKHR& value); +std::ostream& operator<< (std::ostream& s, const VkDeviceImageMemoryRequirementsKHR& 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); diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl index 188e9c4..d1c3446 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl @@ -699,6 +699,8 @@ const char* getStructureTypeName (VkStructureType value) case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR"; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR: return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR"; + case VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR: return "VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR"; + case VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR: return "VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR"; case VK_STRUCTURE_TYPE_MAX_ENUM: return "VK_STRUCTURE_TYPE_MAX_ENUM"; default: return DE_NULL; } @@ -8661,6 +8663,27 @@ std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceMaintenance4Pro return s; } +std::ostream& operator<< (std::ostream& s, const VkDeviceBufferMemoryRequirementsKHR& value) +{ + s << "VkDeviceBufferMemoryRequirementsKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tpCreateInfo = " << value.pCreateInfo << '\n'; + s << '}'; + return s; +} + +std::ostream& operator<< (std::ostream& s, const VkDeviceImageMemoryRequirementsKHR& value) +{ + s << "VkDeviceImageMemoryRequirementsKHR = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tpCreateInfo = " << value.pCreateInfo << '\n'; + s << "\tplaneAspect = " << value.planeAspect << '\n'; + s << '}'; + return s; +} + std::ostream& operator<< (std::ostream& s, const VkDebugReportCallbackCreateInfoEXT& value) { s << "VkDebugReportCallbackCreateInfoEXT = {\n"; diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index bad80ae..4d05948 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -3249,6 +3249,21 @@ struct VkPhysicalDeviceMaintenance4PropertiesKHR VkDeviceSize maxBufferSize; }; +struct VkDeviceBufferMemoryRequirementsKHR +{ + VkStructureType sType; + const void* pNext; + const VkBufferCreateInfo* pCreateInfo; +}; + +struct VkDeviceImageMemoryRequirementsKHR +{ + VkStructureType sType; + const void* pNext; + const VkImageCreateInfo* pCreateInfo; + VkImageAspectFlagBits planeAspect; +}; + struct VkDebugReportCallbackCreateInfoEXT { VkStructureType sType; diff --git a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl index 0c38feb..ad6410f 100644 --- a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl +++ b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl @@ -195,9 +195,9 @@ virtual void cmdCopyBufferToImage2KHR (VkCommandBuffer commandBuffer, co virtual void cmdCopyImageToBuffer2KHR (VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR* pCopyImageToBufferInfo) const = 0; virtual void cmdBlitImage2KHR (VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR* pBlitImageInfo) const = 0; virtual void cmdResolveImage2KHR (VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR* pResolveImageInfo) const = 0; -virtual void getBufferCreateInfoMemoryRequirementsKHR (VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0; -virtual void getImageCreateInfoMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0; -virtual void getImageCreateInfoSparseMemoryRequirementsKHR (VkDevice device, const VkImageCreateInfo* pCreateInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) const = 0; +virtual void getDeviceBufferMemoryRequirementsKHR (VkDevice device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0; +virtual void getDeviceImageMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements) const = 0; +virtual void getDeviceImageSparseMemoryRequirementsKHR (VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements) 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 c66688a..c54dd8f 100644 --- a/external/vulkancts/framework/vulkan/vkVulkan_c.inl +++ b/external/vulkancts/framework/vulkan/vkVulkan_c.inl @@ -1754,6 +1754,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = 1000413000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = 1000413001, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = 1000413002, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = 1000413003, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -9379,24 +9381,37 @@ typedef struct VkPhysicalDeviceMaintenance4PropertiesKHR { VkDeviceSize maxBufferSize; } VkPhysicalDeviceMaintenance4PropertiesKHR; -typedef void (VKAPI_PTR *PFN_vkGetBufferCreateInfoMemoryRequirementsKHR)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkGetImageCreateInfoMemoryRequirementsKHR)(VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkGetImageCreateInfoSparseMemoryRequirementsKHR)(VkDevice device, const VkImageCreateInfo* pCreateInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); +typedef struct VkDeviceBufferMemoryRequirementsKHR { + VkStructureType sType; + const void* pNext; + const VkBufferCreateInfo* pCreateInfo; +} VkDeviceBufferMemoryRequirementsKHR; + +typedef struct VkDeviceImageMemoryRequirementsKHR { + VkStructureType sType; + const void* pNext; + const VkImageCreateInfo* pCreateInfo; + VkImageAspectFlagBits planeAspect; +} VkDeviceImageMemoryRequirementsKHR; + +typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice device, const VkDeviceBufferMemoryRequirementsKHR *pInfo, VkMemoryRequirements2 *pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, VkMemoryRequirements2 *pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, deUint32 *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements); #ifndef VK_NO_PROTOTYPES -VKAPI_ATTR void VKAPI_CALL vkGetBufferCreateInfoMemoryRequirementsKHR( +VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirementsKHR( VkDevice device, - const VkBufferCreateInfo* pCreateInfo, + const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); -VKAPI_ATTR void VKAPI_CALL vkGetImageCreateInfoMemoryRequirementsKHR( +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirementsKHR( VkDevice device, - const VkImageCreateInfo* pCreateInfo, + const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); -VKAPI_ATTR void VKAPI_CALL vkGetImageCreateInfoSparseMemoryRequirementsKHR( +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirementsKHR( VkDevice device, - const VkImageCreateInfo* pCreateInfo, + const VkDeviceImageMemoryRequirementsKHR* pInfo, deUint32* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); #endif diff --git a/external/vulkancts/scripts/src/vulkan_core.h b/external/vulkancts/scripts/src/vulkan_core.h index 913829e..1adea7f 100644 --- a/external/vulkancts/scripts/src/vulkan_core.h +++ b/external/vulkancts/scripts/src/vulkan_core.h @@ -850,6 +850,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT = 1000412000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR = 1000413000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = 1000413001, + VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = 1000413002, + VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = 1000413003, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -8475,24 +8477,37 @@ typedef struct VkPhysicalDeviceMaintenance4PropertiesKHR { VkDeviceSize maxBufferSize; } VkPhysicalDeviceMaintenance4PropertiesKHR; -typedef void (VKAPI_PTR *PFN_vkGetBufferCreateInfoMemoryRequirementsKHR)(VkDevice device, const VkBufferCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkGetImageCreateInfoMemoryRequirementsKHR)(VkDevice device, const VkImageCreateInfo* pCreateInfo, VkMemoryRequirements2* pMemoryRequirements); -typedef void (VKAPI_PTR *PFN_vkGetImageCreateInfoSparseMemoryRequirementsKHR)(VkDevice device, const VkImageCreateInfo* pCreateInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); +typedef struct VkDeviceBufferMemoryRequirementsKHR { + VkStructureType sType; + const void* pNext; + const VkBufferCreateInfo* pCreateInfo; +} VkDeviceBufferMemoryRequirementsKHR; + +typedef struct VkDeviceImageMemoryRequirementsKHR { + VkStructureType sType; + const void* pNext; + const VkImageCreateInfo* pCreateInfo; + VkImageAspectFlagBits planeAspect; +} VkDeviceImageMemoryRequirementsKHR; + +typedef void (VKAPI_PTR *PFN_vkGetDeviceBufferMemoryRequirementsKHR)(VkDevice device, const VkDeviceBufferMemoryRequirementsKHR *pInfo, VkMemoryRequirements2 *pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, VkMemoryRequirements2 *pMemoryRequirements); +typedef void (VKAPI_PTR *PFN_vkGetDeviceImageSparseMemoryRequirementsKHR)(VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements); #ifndef VK_NO_PROTOTYPES -VKAPI_ATTR void VKAPI_CALL vkGetBufferCreateInfoMemoryRequirementsKHR( +VKAPI_ATTR void VKAPI_CALL vkGetDeviceBufferMemoryRequirementsKHR( VkDevice device, - const VkBufferCreateInfo* pCreateInfo, + const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); -VKAPI_ATTR void VKAPI_CALL vkGetImageCreateInfoMemoryRequirementsKHR( +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageMemoryRequirementsKHR( VkDevice device, - const VkImageCreateInfo* pCreateInfo, + const VkDeviceImageMemoryRequirementsKHR* pInfo, VkMemoryRequirements2* pMemoryRequirements); -VKAPI_ATTR void VKAPI_CALL vkGetImageCreateInfoSparseMemoryRequirementsKHR( +VKAPI_ATTR void VKAPI_CALL vkGetDeviceImageSparseMemoryRequirementsKHR( VkDevice device, - const VkImageCreateInfo* pCreateInfo, + const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t* pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2* pSparseMemoryRequirements); #endif -- 2.7.4