Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-1.1.1
Change-Id: Ib38bd02e2ed4c74ee845e19eb25b8de05fb0e312
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 87a4c24..9f49785 100755
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -195619,7 +195619,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
diff --git a/android/cts/nyc/src/vk-master.txt b/android/cts/nyc/src/vk-master.txt
index cd86b58..8c3528c 100644
--- a/android/cts/nyc/src/vk-master.txt
+++ b/android/cts/nyc/src/vk-master.txt
@@ -63254,7 +63254,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/android/cts/nyc/vk-master.txt b/android/cts/nyc/vk-master.txt
index e22378d..c82edd5 100644
--- a/android/cts/nyc/vk-master.txt
+++ b/android/cts/nyc/vk-master.txt
@@ -65726,7 +65726,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 66a6db7..613c9a8 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -4929,7 +4929,6 @@
cases.push_back(CaseParameter("none", "None"));
cases.push_back(CaseParameter("unroll", "Unroll"));
cases.push_back(CaseParameter("dont_unroll", "DontUnroll"));
- cases.push_back(CaseParameter("unroll_dont_unroll", "Unroll|DontUnroll"));
fillRandomScalars(rnd, -100.f, 100.f, &inputFloats[0], numElements);
diff --git a/external/vulkancts/mustpass/1.0.0/src/master.txt b/external/vulkancts/mustpass/1.0.0/src/master.txt
index 120ca58..9b29730 100644
--- a/external/vulkancts/mustpass/1.0.0/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.0/src/master.txt
@@ -65167,7 +65167,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.0/vk-default.txt b/external/vulkancts/mustpass/1.0.0/vk-default.txt
index 120ca58..9b29730 100644
--- a/external/vulkancts/mustpass/1.0.0/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.0/vk-default.txt
@@ -65167,7 +65167,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.1/src/master.txt b/external/vulkancts/mustpass/1.0.1/src/master.txt
index 35c60b5..d821d31 100644
--- a/external/vulkancts/mustpass/1.0.1/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.1/src/master.txt
@@ -74783,7 +74783,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt
index 35c60b5..d821d31 100644
--- a/external/vulkancts/mustpass/1.0.1/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt
@@ -74783,7 +74783,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.2/src/master.txt b/external/vulkancts/mustpass/1.0.2/src/master.txt
index 4d67d91..c9c3d83 100644
--- a/external/vulkancts/mustpass/1.0.2/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.2/src/master.txt
@@ -138443,7 +138443,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.2/vk-default.txt b/external/vulkancts/mustpass/1.0.2/vk-default.txt
index 4d67d91..c9c3d83 100644
--- a/external/vulkancts/mustpass/1.0.2/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt
@@ -138443,7 +138443,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.3/src/master.txt b/external/vulkancts/mustpass/1.0.3/src/master.txt
index 5eb236f..a97392b 100644
--- a/external/vulkancts/mustpass/1.0.3/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.3/src/master.txt
@@ -191173,7 +191173,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.3/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.0.3/vk-default-no-waivers.txt
index 5eb236f..a97392b 100644
--- a/external/vulkancts/mustpass/1.0.3/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default-no-waivers.txt
@@ -191173,7 +191173,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.0.3/vk-default.txt b/external/vulkancts/mustpass/1.0.3/vk-default.txt
index 06082a4..0c30d2d 100644
--- a/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt
@@ -191173,7 +191173,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
dEQP-VK.spirv_assembly.instruction.compute.function_control.inline
dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline
diff --git a/external/vulkancts/mustpass/1.1.0/src/master.txt b/external/vulkancts/mustpass/1.1.0/src/master.txt
index 53c321d..57dff23 100644
--- a/external/vulkancts/mustpass/1.1.0/src/master.txt
+++ b/external/vulkancts/mustpass/1.1.0/src/master.txt
@@ -195624,7 +195624,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
diff --git a/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt
index 53c321d..57dff23 100644
--- a/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt
@@ -195624,7 +195624,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
diff --git a/external/vulkancts/mustpass/1.1.0/vk-default.txt b/external/vulkancts/mustpass/1.1.0/vk-default.txt
index 747ca54..1e4159d 100755
--- a/external/vulkancts/mustpass/1.1.0/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.0/vk-default.txt
@@ -195624,7 +195624,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
diff --git a/external/vulkancts/mustpass/1.1.1/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.1/vk-default-no-waivers.txt
index 6c8727c..d8591cc 100644
--- a/external/vulkancts/mustpass/1.1.1/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.1/vk-default-no-waivers.txt
@@ -195624,7 +195624,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
diff --git a/external/vulkancts/mustpass/1.1.1/vk-default.txt b/external/vulkancts/mustpass/1.1.1/vk-default.txt
index e6e4512..0d3ceb5 100644
--- a/external/vulkancts/mustpass/1.1.1/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.1/vk-default.txt
@@ -195624,7 +195624,6 @@
dEQP-VK.spirv_assembly.instruction.compute.loop_control.none
dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll
-dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length
dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite
dEQP-VK.spirv_assembly.instruction.compute.function_control.none
