Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2
Change-Id: Id1dfb48db9c7c5ad1d4260e4595617723034af04
diff --git a/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt b/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
index 6ac7ea4..e073c3f 100644
--- a/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.1.2/src/excluded-tests.txt
@@ -64,3 +64,9 @@
dEQP-VK.ssbo.layout.random.16bit.relaxed.55
dEQP-VK.ssbo.layout.random.16bit.relaxed.73
dEQP-VK.ssbo.layout.random.8bit.nested_structs_arrays.14
+
+#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.2/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
index 4b4cae2..ea5ee7f 100644
--- a/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
@@ -330712,7 +330712,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
@@ -330720,13 +330719,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.2/vk-default.txt b/external/vulkancts/mustpass/1.1.2/vk-default.txt
index 999b1ea..9ff618e 100644
--- a/external/vulkancts/mustpass/1.1.2/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.2/vk-default.txt
@@ -330673,7 +330673,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
@@ -330681,13 +330680,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
