Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / api / vktApiDriverPropertiesTests.cpp

diff --git a/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index 496369a..e7689cb 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@ -65,24 +65,31 @@ static const deUint32 knownDriverIds[] =
 
 static const VkConformanceVersionKHR knownConformanceVersions[] =
 {
-       makeConformanceVersionKHR(1, 1, 6, 2),
-       makeConformanceVersionKHR(1, 1, 6, 1),
-       makeConformanceVersionKHR(1, 1, 6, 0),
-       makeConformanceVersionKHR(1, 1, 5, 2),
-       makeConformanceVersionKHR(1, 1, 5, 1),
-       makeConformanceVersionKHR(1, 1, 5, 0),
-       makeConformanceVersionKHR(1, 1, 4, 3),
-       makeConformanceVersionKHR(1, 1, 4, 2),
-       makeConformanceVersionKHR(1, 1, 4, 1),
-       makeConformanceVersionKHR(1, 1, 4, 0),
-       makeConformanceVersionKHR(1, 1, 3, 3),
-       makeConformanceVersionKHR(1, 1, 3, 2),
-       makeConformanceVersionKHR(1, 1, 3, 1),
-       makeConformanceVersionKHR(1, 1, 3, 0),
-       makeConformanceVersionKHR(1, 1, 2, 3),
-       makeConformanceVersionKHR(1, 1, 2, 2),
-       makeConformanceVersionKHR(1, 1, 2, 1),
-       makeConformanceVersionKHR(1, 1, 2, 0),
+       makeConformanceVersion(1, 2, 0, 2),
+       makeConformanceVersion(1, 2, 0, 1),
+       makeConformanceVersion(1, 2, 0, 0),
+       makeConformanceVersion(1, 1, 6, 2),
+       makeConformanceVersion(1, 1, 6, 1),
+       makeConformanceVersion(1, 1, 6, 0),
+       makeConformanceVersion(1, 1, 5, 2),
+       makeConformanceVersion(1, 1, 5, 1),
+       makeConformanceVersion(1, 1, 5, 0),
+       makeConformanceVersion(1, 1, 4, 3),
+       makeConformanceVersion(1, 1, 4, 2),
+       makeConformanceVersion(1, 1, 4, 1),
+       makeConformanceVersion(1, 1, 4, 0),
+       makeConformanceVersion(1, 1, 3, 3),
+       makeConformanceVersion(1, 1, 3, 2),
+       makeConformanceVersion(1, 1, 3, 1),
+       makeConformanceVersion(1, 1, 3, 0),
+       makeConformanceVersion(1, 1, 2, 3),
+       makeConformanceVersion(1, 1, 2, 2),
+       makeConformanceVersion(1, 1, 2, 1),
+       makeConformanceVersion(1, 1, 2, 0),
+       makeConformanceVersion(1, 1, 1, 3),
+       makeConformanceVersion(1, 1, 1, 2),
+       makeConformanceVersion(1, 1, 1, 1),
+       makeConformanceVersion(1, 1, 1, 0),
 };
 
 DE_INLINE bool isNullTerminated(const char* str, const deUint32 maxSize)
@@ -90,7 +97,7 @@ DE_INLINE bool isNullTerminated(const char* str, const deUint32 maxSize)
        return deStrnlen(str, maxSize) < maxSize;
 }
 
-DE_INLINE bool operator==(const VkConformanceVersionKHR& a, const VkConformanceVersionKHR& b)
+DE_INLINE bool operator==(const VkConformanceVersion& a, const VkConformanceVersion& b)
 {
        return ((a.major == b.major)            &&
                        (a.minor == b.minor)            &&
@@ -152,7 +159,7 @@ tcu::TestStatus testQueryProperties (Context& context, const TestType testType)
        const VkPhysicalDevice                          physDevice                      = context.getPhysicalDevice();
        const int                                                       memsetPattern           = 0xaa;
        VkPhysicalDeviceProperties2                     deviceProperties2;
-       VkPhysicalDeviceDriverPropertiesKHR     deviceDriverProperties;
+       VkPhysicalDeviceDriverProperties        deviceDriverProperties;
 
        deMemset(&deviceDriverProperties, memsetPattern, sizeof(deviceDriverProperties));
        deviceDriverProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR;