From 1378177a28628523454619d99c1563bc4e538f6d Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Mon, 19 Sep 2016 14:51:00 -0700 Subject: [PATCH] Update Vulkan framework to vulkan.h 1.0.27 Change-Id: I3c1bf3295982792c4fa47263f7f3868758d4aedb --- .../vulkancts/framework/vulkan/vkBasicTypes.inl | 8 ++++++++ external/vulkancts/framework/vulkan/vkStrUtil.inl | 4 ++++ .../vulkancts/framework/vulkan/vkStrUtilImpl.inl | 21 +++++++++++++++++++++ .../vulkancts/framework/vulkan/vkStructTypes.inl | 8 ++++++++ 4 files changed, 41 insertions(+) diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index fb8c3bb..f349538 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -155,6 +155,7 @@ enum VkStructureType VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000, VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057001, VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV = 1000058000, + VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT = 1000061000, }; enum VkSystemAllocationScope @@ -772,6 +773,13 @@ enum VkRasterizationOrderAMD VK_RASTERIZATION_ORDER_AMD_LAST }; +enum VkValidationCheckEXT +{ + VK_VALIDATION_CHECK_ALL_EXT = 0, + + VK_VALIDATION_CHECK_EXT_LAST +}; + enum VkFormatFeatureFlagBits { VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT = 0x00000001, diff --git a/external/vulkancts/framework/vulkan/vkStrUtil.inl b/external/vulkancts/framework/vulkan/vkStrUtil.inl index a555916..f859dc5 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtil.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtil.inl @@ -41,6 +41,7 @@ const char* getPresentModeKHRName (VkPresentModeKHR value); const char* getDebugReportObjectTypeEXTName (VkDebugReportObjectTypeEXT value); const char* getDebugReportErrorEXTName (VkDebugReportErrorEXT value); const char* getRasterizationOrderAMDName (VkRasterizationOrderAMD value); +const char* getValidationCheckEXTName (VkValidationCheckEXT value); inline tcu::Format::Enum getPipelineCacheHeaderVersionStr (VkPipelineCacheHeaderVersion value) { return tcu::Format::Enum(getPipelineCacheHeaderVersionName, value); } inline tcu::Format::Enum getResultStr (VkResult value) { return tcu::Format::Enum(getResultName, value); } @@ -82,6 +83,7 @@ inline tcu::Format::Enum getPresentModeKHRStr (VkPresent inline tcu::Format::Enum getDebugReportObjectTypeEXTStr (VkDebugReportObjectTypeEXT value) { return tcu::Format::Enum(getDebugReportObjectTypeEXTName, value); } inline tcu::Format::Enum getDebugReportErrorEXTStr (VkDebugReportErrorEXT value) { return tcu::Format::Enum(getDebugReportErrorEXTName, value); } inline tcu::Format::Enum getRasterizationOrderAMDStr (VkRasterizationOrderAMD value) { return tcu::Format::Enum(getRasterizationOrderAMDName, value); } +inline tcu::Format::Enum getValidationCheckEXTStr (VkValidationCheckEXT value) { return tcu::Format::Enum(getValidationCheckEXTName, value); } inline std::ostream& operator<< (std::ostream& s, VkPipelineCacheHeaderVersion value) { return s << getPipelineCacheHeaderVersionStr(value); } inline std::ostream& operator<< (std::ostream& s, VkResult value) { return s << getResultStr(value); } @@ -123,6 +125,7 @@ inline std::ostream& operator<< (std::ostream& s, VkPresentModeKHR value) { r inline std::ostream& operator<< (std::ostream& s, VkDebugReportObjectTypeEXT value) { return s << getDebugReportObjectTypeEXTStr(value); } inline std::ostream& operator<< (std::ostream& s, VkDebugReportErrorEXT value) { return s << getDebugReportErrorEXTStr(value); } inline std::ostream& operator<< (std::ostream& s, VkRasterizationOrderAMD value) { return s << getRasterizationOrderAMDStr(value); } +inline std::ostream& operator<< (std::ostream& s, VkValidationCheckEXT value) { return s << getValidationCheckEXTStr(value); } tcu::Format::Bitfield<32> getFormatFeatureFlagsStr (VkFormatFeatureFlags value); tcu::Format::Bitfield<32> getImageUsageFlagsStr (VkImageUsageFlags value); @@ -337,3 +340,4 @@ std::ostream& operator<< (std::ostream& s, const VkExportMemoryAllocateInfoNV& v std::ostream& operator<< (std::ostream& s, const VkImportMemoryWin32HandleInfoNV& value); std::ostream& operator<< (std::ostream& s, const VkExportMemoryWin32HandleInfoNV& value); std::ostream& operator<< (std::ostream& s, const VkWin32KeyedMutexAcquireReleaseInfoNV& value); +std::ostream& operator<< (std::ostream& s, const VkValidationFlagsEXT& value); diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl index c09f99a..ad73fcf 100644 --- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl +++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl @@ -170,6 +170,7 @@ const char* getStructureTypeName (VkStructureType value) case VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV: return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV"; case VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV: return "VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV"; case VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV: return "VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV"; + case VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT: return "VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT"; default: return DE_NULL; } } @@ -869,6 +870,15 @@ const char* getRasterizationOrderAMDName (VkRasterizationOrderAMD value) } } +const char* getValidationCheckEXTName (VkValidationCheckEXT value) +{ + switch (value) + { + case VK_VALIDATION_CHECK_ALL_EXT: return "VK_VALIDATION_CHECK_ALL_EXT"; + default: return DE_NULL; + } +} + tcu::Format::Bitfield<32> getFormatFeatureFlagsStr (VkFormatFeatureFlags value) { static const tcu::Format::BitDesc s_desc[] = @@ -3413,3 +3423,14 @@ std::ostream& operator<< (std::ostream& s, const VkWin32KeyedMutexAcquireRelease s << '}'; return s; } + +std::ostream& operator<< (std::ostream& s, const VkValidationFlagsEXT& value) +{ + s << "VkValidationFlagsEXT = {\n"; + s << "\tsType = " << value.sType << '\n'; + s << "\tpNext = " << value.pNext << '\n'; + s << "\tdisabledValidationCheckCount = " << value.disabledValidationCheckCount << '\n'; + s << "\tpDisabledValidationChecks = " << value.pDisabledValidationChecks << '\n'; + s << '}'; + return s; +} diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl index 2078df9..ce507fa 100644 --- a/external/vulkancts/framework/vulkan/vkStructTypes.inl +++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl @@ -1480,3 +1480,11 @@ struct VkWin32KeyedMutexAcquireReleaseInfoNV const deUint64* pReleaseKeys; }; +struct VkValidationFlagsEXT +{ + VkStructureType sType; + const void* pNext; + deUint32 disabledValidationCheckCount; + VkValidationCheckEXT* pDisabledValidationChecks; +}; + -- 2.7.4