Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3
Change-Id: I7f44646072e49414e863e6a4e6bb9760477dccb8
diff --git a/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt b/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
index ed8aeb7..b506bd8 100644
--- a/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
@@ -30,3 +30,9 @@
# Excluded VkRunner example tests
dEQP-VK.vkrunner-example.*
+
+#VK-GL-CTS 1274
+dEQP-VK.rasterization.interpolation.basic.lines_wide
+dEQP-VK.rasterization.interpolation.projected.line_strip_wide
+dEQP-VK.rasterization.flatshading.lines_wide
+
diff --git a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
index 9969e66..146f082 100644
--- a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
@@ -351494,7 +351494,6 @@
dEQP-VK.rasterization.interpolation.basic.triangle_fan
dEQP-VK.rasterization.interpolation.basic.lines
dEQP-VK.rasterization.interpolation.basic.line_strip
-dEQP-VK.rasterization.interpolation.basic.lines_wide
dEQP-VK.rasterization.interpolation.basic.line_strip_wide
dEQP-VK.rasterization.interpolation.projected.triangles
dEQP-VK.rasterization.interpolation.projected.triangle_strip
@@ -351502,13 +351501,11 @@
dEQP-VK.rasterization.interpolation.projected.lines
dEQP-VK.rasterization.interpolation.projected.line_strip
dEQP-VK.rasterization.interpolation.projected.lines_wide
-dEQP-VK.rasterization.interpolation.projected.line_strip_wide
dEQP-VK.rasterization.flatshading.triangles
dEQP-VK.rasterization.flatshading.triangle_strip
dEQP-VK.rasterization.flatshading.triangle_fan
dEQP-VK.rasterization.flatshading.lines
dEQP-VK.rasterization.flatshading.line_strip
-dEQP-VK.rasterization.flatshading.lines_wide
dEQP-VK.rasterization.flatshading.line_strip_wide
dEQP-VK.rasterization.primitives_multisample_2_bit.triangles
dEQP-VK.rasterization.primitives_multisample_2_bit.lines
diff --git a/external/vulkancts/mustpass/1.1.3/vk-default.txt b/external/vulkancts/mustpass/1.1.3/vk-default.txt
index adc3c17..c8d917d 100644
--- a/external/vulkancts/mustpass/1.1.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default.txt
@@ -351455,7 +351455,6 @@
dEQP-VK.rasterization.interpolation.basic.triangle_fan
dEQP-VK.rasterization.interpolation.basic.lines
dEQP-VK.rasterization.interpolation.basic.line_strip
-dEQP-VK.rasterization.interpolation.basic.lines_wide
dEQP-VK.rasterization.interpolation.basic.line_strip_wide
dEQP-VK.rasterization.interpolation.projected.triangles
dEQP-VK.rasterization.interpolation.projected.triangle_strip
@@ -351463,13 +351462,11 @@
dEQP-VK.rasterization.interpolation.projected.lines
dEQP-VK.rasterization.interpolation.projected.line_strip
dEQP-VK.rasterization.interpolation.projected.lines_wide
-dEQP-VK.rasterization.interpolation.projected.line_strip_wide
dEQP-VK.rasterization.flatshading.triangles
dEQP-VK.rasterization.flatshading.triangle_strip
dEQP-VK.rasterization.flatshading.triangle_fan
dEQP-VK.rasterization.flatshading.lines
dEQP-VK.rasterization.flatshading.line_strip
-dEQP-VK.rasterization.flatshading.lines_wide
dEQP-VK.rasterization.flatshading.line_strip_wide
dEQP-VK.rasterization.primitives_multisample_2_bit.triangles
dEQP-VK.rasterization.primitives_multisample_2_bit.lines
