Update Vulkan framework to vulkan.h 1.0.27
authorPyry Haulos <phaulos@google.com>
Mon, 19 Sep 2016 21:51:00 +0000 (14:51 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 19 Sep 2016 21:51:00 +0000 (14:51 -0700)
Change-Id: I3c1bf3295982792c4fa47263f7f3868758d4aedb

external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkStrUtil.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl

index fb8c3bb..f349538 100644 (file)
@@ -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,
index a555916..f859dc5 100644 (file)
@@ -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<VkPipelineCacheHeaderVersion> getPipelineCacheHeaderVersionStr        (VkPipelineCacheHeaderVersion value)    { return tcu::Format::Enum<VkPipelineCacheHeaderVersion>(getPipelineCacheHeaderVersionName, value);     }
 inline tcu::Format::Enum<VkResult>                                             getResultStr                                            (VkResult value)                                                { return tcu::Format::Enum<VkResult>(getResultName, value);                                                                                     }
@@ -82,6 +83,7 @@ inline tcu::Format::Enum<VkPresentModeKHR>                            getPresentModeKHRStr                            (VkPresent
 inline tcu::Format::Enum<VkDebugReportObjectTypeEXT>   getDebugReportObjectTypeEXTStr          (VkDebugReportObjectTypeEXT value)              { return tcu::Format::Enum<VkDebugReportObjectTypeEXT>(getDebugReportObjectTypeEXTName, value);         }
 inline tcu::Format::Enum<VkDebugReportErrorEXT>                        getDebugReportErrorEXTStr                       (VkDebugReportErrorEXT value)                   { return tcu::Format::Enum<VkDebugReportErrorEXT>(getDebugReportErrorEXTName, value);                           }
 inline tcu::Format::Enum<VkRasterizationOrderAMD>              getRasterizationOrderAMDStr                     (VkRasterizationOrderAMD value)                 { return tcu::Format::Enum<VkRasterizationOrderAMD>(getRasterizationOrderAMDName, value);                       }
+inline tcu::Format::Enum<VkValidationCheckEXT>                 getValidationCheckEXTStr                        (VkValidationCheckEXT value)                    { return tcu::Format::Enum<VkValidationCheckEXT>(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);
index c09f99a..ad73fcf 100644 (file)
@@ -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;
+}
index 2078df9..ce507fa 100644 (file)
@@ -1480,3 +1480,11 @@ struct VkWin32KeyedMutexAcquireReleaseInfoNV
        const deUint64*                 pReleaseKeys;
 };
 
+struct VkValidationFlagsEXT
+{
+       VkStructureType                 sType;
+       const void*                             pNext;
+       deUint32                                disabledValidationCheckCount;
+       VkValidationCheckEXT*   pDisabledValidationChecks;
+};
+