projects / platform / upstream / VK-GL-CTS.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update Android CTS mustpass
[platform/upstream/VK-GL-CTS.git] / android / cts / nyc / com.drawelements.deqp.vk.xml
diff --git a/android/cts/nyc/com.drawelements.deqp.vk.xml b/android/cts/nyc/com.drawelements.deqp.vk.xml
index e0b5ce3..bd1932e 100644 (file)
--- a/android/cts/nyc/com.drawelements.deqp.vk.xml
+++ b/android/cts/nyc/com.drawelements.deqp.vk.xml
@@ -11639,18 +11639,12 @@
                                <Test name="allocate_many_primary">
                                        <TestInstance/>
                                </Test>
-                               <Test name="allocate_zero_primary">
-                                       <TestInstance/>
-                               </Test>
                                <Test name="allocate_single_secondary">
                                        <TestInstance/>
                                </Test>
                                <Test name="allocate_many_secondary">
                                        <TestInstance/>
                                </Test>
-                               <Test name="allocate_zero_secondary">
-                                       <TestInstance/>
-                               </Test>
                                <Test name="execute_small_primary">
                                        <TestInstance/>
                                </Test>
@@ -11728,26 +11722,6 @@
                                </Test>
                        </TestCase>
                        <TestSuite name="copy_and_blit">
-                               <TestCase name="image_to_image">
-                                       <Test name="whole_image">
-                                               <TestInstance/>
-                                       </Test>
-                                       <Test name="whole_image_diff_fromat">
-                                               <TestInstance/>
-                                       </Test>
-                                       <Test name="partial_image">
-                                               <TestInstance/>
-                                       </Test>
-                                       <Test name="partial_image_multiple">
-                                               <TestInstance/>
-                                       </Test>
-                                       <Test name="depth">
-                                               <TestInstance/>
-                                       </Test>
-                                       <Test name="stencil">
-                                               <TestInstance/>
-                                       </Test>
-                               </TestCase>
                                <TestCase name="image_to_buffer">
                                        <Test name="whole">
                                                <TestInstance/>
@@ -145054,16 +145028,16 @@
                                                <TestSuite name="format">
                                                        <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145138,16 +145112,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r5g6b5_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145222,16 +145196,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145264,16 +145238,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145306,16 +145280,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145348,16 +145322,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145390,16 +145364,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145432,16 +145406,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145474,16 +145448,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145516,16 +145490,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145558,16 +145532,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145600,16 +145574,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145642,16 +145616,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145684,16 +145658,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145726,16 +145700,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145768,16 +145742,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145810,16 +145784,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145852,16 +145826,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145894,16 +145868,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145936,16 +145910,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -145978,16 +145952,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146020,16 +145994,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146062,16 +146036,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146398,16 +146372,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146440,16 +146414,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146524,16 +146498,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146566,16 +146540,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146608,16 +146582,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146650,16 +146624,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146692,16 +146666,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146734,16 +146708,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146776,16 +146750,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146818,16 +146792,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146860,16 +146834,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146902,16 +146876,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146944,16 +146918,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -146986,16 +146960,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147028,16 +147002,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147070,16 +147044,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147112,16 +147086,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147154,16 +147128,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147196,16 +147170,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147238,16 +147212,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147280,16 +147254,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147322,16 +147296,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147364,16 +147338,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147700,16 +147674,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147742,16 +147716,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147784,16 +147758,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147826,16 +147800,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147868,16 +147842,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147910,16 +147884,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147952,16 +147926,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -147994,16 +147968,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148036,16 +148010,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148204,16 +148178,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148246,16 +148220,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148288,16 +148262,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148330,16 +148304,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148376,16 +148350,16 @@
                                                <TestSuite name="format">
                                                        <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148478,16 +148452,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r5g6b5_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148580,16 +148554,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148631,16 +148605,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148682,16 +148656,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148733,16 +148707,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148784,16 +148758,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148835,16 +148809,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148886,16 +148860,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148937,16 +148911,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -148988,16 +148962,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149039,16 +149013,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149090,16 +149064,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149141,16 +149115,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149192,16 +149166,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149243,16 +149217,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149294,16 +149268,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149345,16 +149319,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149396,16 +149370,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149447,16 +149421,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149498,16 +149472,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149549,16 +149523,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -149600,16 +149574,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150008,16 +149982,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150059,16 +150033,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150161,16 +150135,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150212,16 +150186,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150263,16 +150237,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150314,16 +150288,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150365,16 +150339,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150416,16 +150390,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150467,16 +150441,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150518,16 +150492,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150569,16 +150543,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150620,16 +150594,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150671,16 +150645,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150722,16 +150696,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150773,16 +150747,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150824,16 +150798,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150875,16 +150849,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150926,16 +150900,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -150977,16 +150951,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151028,16 +151002,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151079,16 +151053,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151130,16 +151104,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151181,16 +151155,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151589,16 +151563,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151640,16 +151614,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151691,16 +151665,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151742,16 +151716,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151793,16 +151767,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151844,16 +151818,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151895,16 +151869,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151946,16 +151920,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -151997,57 +151971,57 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="g_b_one_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="b_one_r_g">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="one_r_g_b">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
-                                                       <TestSuite name="r32g32b32a32_uint">
-                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="g_b_a_r">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="b_a_r_g">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="a_r_g_b">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="r32g32b32a32_uint">
+                                                               <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
@@ -152201,16 +152175,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152252,16 +152226,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152303,16 +152277,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152354,16 +152328,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152409,16 +152383,16 @@
                                                <TestSuite name="format">
                                                        <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152493,16 +152467,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r5g6b5_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152577,16 +152551,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152619,16 +152593,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152661,16 +152635,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152703,16 +152677,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152745,16 +152719,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152787,16 +152761,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152829,16 +152803,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152871,16 +152845,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152913,16 +152887,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152955,16 +152929,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -152997,16 +152971,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153039,16 +153013,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153081,16 +153055,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153123,16 +153097,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153165,16 +153139,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153207,16 +153181,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153249,16 +153223,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153291,16 +153265,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153333,16 +153307,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153375,16 +153349,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153417,16 +153391,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153753,16 +153727,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153795,16 +153769,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153879,16 +153853,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153921,16 +153895,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -153963,16 +153937,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154005,16 +153979,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154047,16 +154021,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154089,16 +154063,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154131,16 +154105,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154173,16 +154147,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154215,16 +154189,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154257,16 +154231,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154299,16 +154273,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154341,16 +154315,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154383,16 +154357,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154425,16 +154399,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154467,16 +154441,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154509,16 +154483,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154551,16 +154525,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154593,16 +154567,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154635,16 +154609,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154677,16 +154651,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -154719,16 +154693,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155055,16 +155029,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155097,16 +155071,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155139,16 +155113,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155181,16 +155155,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155223,16 +155197,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155265,16 +155239,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155307,16 +155281,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155349,16 +155323,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155391,16 +155365,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155559,16 +155533,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155601,16 +155575,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155643,16 +155617,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155685,16 +155659,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155727,16 +155701,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155769,16 +155743,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_srgb_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -155979,16 +155953,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -156021,16 +155995,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -156063,16 +156037,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -156105,16 +156079,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157327,16 +157301,16 @@
                                                <TestSuite name="format">
                                                        <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157429,16 +157403,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r5g6b5_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157531,16 +157505,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157582,16 +157556,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157633,16 +157607,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157684,16 +157658,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157735,16 +157709,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157786,16 +157760,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157837,16 +157811,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157888,16 +157862,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157939,16 +157913,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -157990,16 +157964,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158041,16 +158015,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158092,16 +158066,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158143,16 +158117,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158194,16 +158168,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158245,16 +158219,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158296,16 +158270,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158347,16 +158321,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158398,16 +158372,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158449,16 +158423,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158500,16 +158474,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158551,16 +158525,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -158959,16 +158933,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159010,16 +158984,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159112,16 +159086,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159163,16 +159137,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159214,16 +159188,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159265,16 +159239,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159316,16 +159290,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159367,16 +159341,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159418,16 +159392,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159469,16 +159443,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159520,16 +159494,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159571,16 +159545,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159622,16 +159596,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159673,16 +159647,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159724,16 +159698,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159775,16 +159749,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159826,16 +159800,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159877,16 +159851,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159928,16 +159902,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -159979,16 +159953,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160030,16 +160004,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160081,16 +160055,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160132,16 +160106,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160540,16 +160514,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160591,16 +160565,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160642,16 +160616,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160693,16 +160667,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160744,16 +160718,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160795,16 +160769,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160846,16 +160820,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160897,16 +160871,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -160948,16 +160922,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161152,16 +161126,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161203,16 +161177,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161254,16 +161228,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161305,16 +161279,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161356,16 +161330,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161407,16 +161381,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_srgb_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161662,16 +161636,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161713,16 +161687,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161764,16 +161738,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -161815,16 +161789,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -162986,7 +162960,160 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="astc_10x10_unorm_block">
+                                                       <TestSuite name="astc_10x10_unorm_block">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="g_b_a_r">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="b_a_r_g">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="a_r_g_b">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="astc_10x10_srgb_block">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="g_b_a_r">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="b_a_r_g">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="a_r_g_b">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="astc_12x10_unorm_block">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="g_b_a_r">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="b_a_r_g">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="a_r_g_b">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_base_array_layer">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_base_and_size">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="astc_12x10_srgb_block">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163037,7 +163164,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="astc_10x10_srgb_block">
+                                                       <TestSuite name="astc_12x12_unorm_block">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163088,7 +163215,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="astc_12x10_unorm_block">
+                                                       <TestSuite name="astc_12x12_srgb_block">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163139,7 +163266,11 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="astc_12x10_srgb_block">
+                                               </TestSuite>
+                                       </TestSuite>
+                                       <TestSuite name="3d">
+                                               <TestSuite name="format">
+                                                       <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163161,36 +163292,9 @@
                                                                        <Test name="lod_mip_levels">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="astc_12x12_unorm_block">
+                                                       <TestSuite name="r4g4b4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163212,36 +163316,33 @@
                                                                        <Test name="lod_mip_levels">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_base_array_layer">
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="r5g6b5_unorm_pack16">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_mip_levels_base_array_layer">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_base_mip_level_array_size">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_mip_levels_array_size">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_base_mip_level_array_base_and_size">
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_mip_levels_array_base_and_size">
+                                                                       <Test name="lod_mip_levels">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="astc_12x12_srgb_block">
+                                                       <TestSuite name="r5g5b5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163263,51 +163364,44 @@
                                                                        <Test name="lod_mip_levels">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="base_array_layer">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_base_and_size">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_base_array_layer">
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="r8_unorm">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_mip_levels_base_array_layer">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_base_mip_level_array_size">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_mip_levels_array_size">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_base_mip_level_array_base_and_size">
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="lod_mip_levels_array_base_and_size">
+                                                                       <Test name="lod_mip_levels">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                               </TestSuite>
-                                       </TestSuite>
-                                       <TestSuite name="3d">
-                                               <TestSuite name="format">
-                                                       <TestSuite name="r4g4_unorm_pack8">
+                                                       <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163320,7 +163414,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r4g4b4a4_unorm_pack16">
+                                                       <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163344,18 +163438,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r5g6b5_unorm_pack16">
+                                                       <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163368,7 +163462,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r5g5b5a1_unorm_pack16">
+                                                       <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163392,18 +163486,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_unorm">
+                                                       <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163416,18 +163510,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_snorm">
+                                                       <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163440,18 +163534,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_uscaled">
+                                                       <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163464,18 +163558,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_sscaled">
+                                                       <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163488,18 +163582,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_uint">
+                                                       <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163512,18 +163606,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_sint">
+                                                       <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163536,18 +163630,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8_srgb">
+                                                       <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163560,18 +163654,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_unorm">
+                                                       <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163584,18 +163678,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_snorm">
+                                                       <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163608,18 +163702,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_uscaled">
+                                                       <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163632,18 +163726,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_sscaled">
+                                                       <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163656,18 +163750,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_uint">
+                                                       <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163680,18 +163774,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_sint">
+                                                       <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163704,18 +163798,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8_srgb">
+                                                       <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163728,18 +163822,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_unorm">
+                                                       <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163752,18 +163846,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_snorm">
+                                                       <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163776,18 +163870,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_uscaled">
+                                                       <TestSuite name="r8g8b8a8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163800,18 +163894,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_sscaled">
+                                                       <TestSuite name="r8g8b8a8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163824,18 +163918,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_uint">
+                                                       <TestSuite name="r8g8b8a8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163848,18 +163942,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_sint">
+                                                       <TestSuite name="r8g8b8a8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163872,18 +163966,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8_srgb">
+                                                       <TestSuite name="r8g8b8a8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -163896,7 +163990,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_unorm">
+                                                       <TestSuite name="r8g8b8a8_sint">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163920,7 +164014,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_snorm">
+                                                       <TestSuite name="r8g8b8a8_srgb">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163944,7 +164038,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_uscaled">
+                                                       <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163968,7 +164062,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_sscaled">
+                                                       <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -163992,7 +164086,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_uint">
+                                                       <TestSuite name="a2b10g10r10_uscaled_pack32">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -164016,7 +164110,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_sint">
+                                                       <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -164040,7 +164134,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r8g8b8a8_srgb">
+                                                       <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -164064,55 +164158,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="a2r10g10b10_unorm_pack32">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="g_r_a_b">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="r_a_b_g">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="a_b_g_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
-                                                       <TestSuite name="a2r10g10b10_uint_pack32">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="g_r_a_b">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="r_a_b_g">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="a_b_g_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
-                                                       <TestSuite name="a2b10g10r10_uscaled_pack32">
+                                                       <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -164136,90 +164182,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="r16_unorm">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_zero_one_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_one_r_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="one_r_zero_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
-                                                       <TestSuite name="r16_snorm">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_zero_one_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_one_r_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="one_r_zero_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
-                                                       <TestSuite name="r16_uscaled">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_zero_one_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_one_r_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="one_r_zero_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164234,16 +164208,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164258,16 +164232,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164282,16 +164256,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164306,16 +164280,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164330,16 +164304,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164354,16 +164328,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164378,16 +164352,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164402,16 +164376,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164426,16 +164400,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164450,16 +164424,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164474,16 +164448,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164498,16 +164472,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164522,16 +164496,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164546,16 +164520,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164570,16 +164544,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164594,16 +164568,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164618,16 +164592,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164810,16 +164784,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164834,16 +164808,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164858,16 +164832,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164882,16 +164856,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164906,16 +164880,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164930,16 +164904,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164954,16 +164928,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -164978,16 +164952,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165002,16 +164976,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165098,16 +165072,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165122,16 +165096,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165146,16 +165120,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165170,16 +165144,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165194,16 +165168,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165218,16 +165192,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_srgb_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165288,7 +165262,31 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="etc2_r8g8b8a8_unorm_block">
+                                                       <TestSuite name="etc2_r8g8b8a8_unorm_block">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="g_b_a_r">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="b_a_r_g">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="a_r_g_b">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="etc2_r8g8b8a8_srgb_block">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -165312,7 +165310,7 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="etc2_r8g8b8a8_srgb_block">
+                                                       <TestSuite name="eac_r11_unorm_block">
                                                                <TestCase name="component_swizzle">
                                                                        <Test name="r_g_b_a">
                                                                                <TestInstance/>
@@ -165336,42 +165334,18 @@
                                                                        </Test>
                                                                </TestCase>
                                                        </TestSuite>
-                                                       <TestSuite name="eac_r11_unorm_block">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_zero_one_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="zero_one_r_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="one_r_zero_zero">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
                                                        <TestSuite name="eac_r11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165386,16 +165360,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -165410,16 +165384,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166110,16 +166084,16 @@
                                                <TestSuite name="format">
                                                        <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166194,16 +166168,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r5g6b5_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166278,16 +166252,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166320,16 +166294,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166362,16 +166336,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166404,16 +166378,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166446,16 +166420,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166488,16 +166462,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166530,16 +166504,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166572,16 +166546,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166614,16 +166588,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166656,16 +166630,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166698,16 +166672,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166740,16 +166714,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166782,16 +166756,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166824,16 +166798,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166866,16 +166840,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166908,16 +166882,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166950,16 +166924,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -166992,16 +166966,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167034,16 +167008,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167076,16 +167050,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167118,16 +167092,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167454,16 +167428,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167496,16 +167470,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167580,16 +167554,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167622,16 +167596,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167664,16 +167638,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167706,16 +167680,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167748,16 +167722,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167790,16 +167764,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167832,16 +167806,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167874,16 +167848,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167916,16 +167890,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -167958,16 +167932,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168000,16 +167974,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168042,16 +168016,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168084,16 +168058,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168126,16 +168100,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168168,16 +168142,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168210,16 +168184,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168252,16 +168226,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168294,16 +168268,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168336,16 +168310,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168378,58 +168352,58 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="g_b_a_r">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="b_a_r_g">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="a_r_g_b">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                               <TestCase name="subresource_range">
+                                                                       <Test name="lod_base_mip_level">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_layer_second">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="array_layer_last">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_layer_second">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_layer_second">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_base_mip_level_array_layer_last">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                                       <Test name="lod_mip_levels_array_layer_last">
+                                                                               <TestInstance/>
+                                                                       </Test>
+                                                               </TestCase>
+                                                       </TestSuite>
+                                                       <TestSuite name="r16g16b16_sfloat">
+                                                               <TestCase name="component_swizzle">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                               <TestCase name="subresource_range">
-                                                                       <Test name="lod_base_mip_level">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_layer_second">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="array_layer_last">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_array_layer_second">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_array_layer_second">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_base_mip_level_array_layer_last">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="lod_mip_levels_array_layer_last">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                               </TestCase>
-                                                       </TestSuite>
-                                                       <TestSuite name="r16g16b16_sfloat">
-                                                               <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="g_b_one_r">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="b_one_r_g">
-                                                                               <TestInstance/>
-                                                                       </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168756,16 +168730,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168798,16 +168772,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168840,16 +168814,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168882,16 +168856,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168924,16 +168898,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -168966,16 +168940,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169008,16 +168982,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169050,16 +169024,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169092,16 +169066,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169260,16 +169234,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169302,16 +169276,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169344,16 +169318,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169386,16 +169360,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169428,16 +169402,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169470,16 +169444,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_srgb_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169680,16 +169654,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169722,16 +169696,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169764,16 +169738,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -169806,16 +169780,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171028,16 +171002,16 @@
                                                <TestSuite name="format">
                                                        <TestSuite name="r4g4_unorm_pack8">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171130,16 +171104,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r5g6b5_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171232,16 +171206,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171283,16 +171257,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171334,16 +171308,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171385,16 +171359,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171436,16 +171410,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171487,16 +171461,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171538,16 +171512,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171589,16 +171563,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171640,16 +171614,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171691,16 +171665,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171742,16 +171716,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171793,16 +171767,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171844,16 +171818,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171895,16 +171869,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171946,16 +171920,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -171997,16 +171971,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172048,16 +172022,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172099,16 +172073,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172150,16 +172124,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172201,16 +172175,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172252,16 +172226,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r8g8b8_srgb">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172660,16 +172634,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_unorm_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172711,16 +172685,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="a2r10g10b10_uint_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172813,16 +172787,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172864,16 +172838,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172915,16 +172889,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -172966,16 +172940,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173017,16 +172991,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173068,16 +173042,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173119,16 +173093,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173170,16 +173144,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173221,16 +173195,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173272,16 +173246,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173323,16 +173297,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173374,16 +173348,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173425,16 +173399,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173476,16 +173450,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173527,16 +173501,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_unorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173578,16 +173552,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_snorm">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173629,16 +173603,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173680,16 +173654,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sscaled">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173731,16 +173705,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173782,16 +173756,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -173833,16 +173807,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r16g16b16_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174241,16 +174215,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174292,16 +174266,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174343,16 +174317,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174394,16 +174368,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174445,16 +174419,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174496,16 +174470,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174547,16 +174521,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_uint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174598,16 +174572,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sint">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174649,16 +174623,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="r32g32b32_sfloat">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174853,16 +174827,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b10g11r11_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174904,16 +174878,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="e5b9g9r9_ufloat_pack32">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -174955,16 +174929,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b4g4r4a4_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175006,16 +174980,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="b5g5r5a1_unorm_pack16">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="b_g_r_a">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_r_a_b">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="r_a_b_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="a_b_g_r">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175057,16 +175031,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175108,16 +175082,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="etc2_r8g8b8_srgb_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_b_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_b_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="b_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_b">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175363,16 +175337,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175414,16 +175388,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_zero_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_zero">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_zero_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175465,16 +175439,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_unorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -175516,16 +175490,16 @@
                                                        </TestSuite>
                                                        <TestSuite name="eac_r11g11_snorm_block">
                                                                <TestCase name="component_swizzle">
-                                                                       <Test name="r_g_zero_one">
+                                                                       <Test name="r_g_b_a">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="g_zero_one_r">
+                                                                       <Test name="g_b_a_r">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="zero_one_r_g">
+                                                                       <Test name="b_a_r_g">
                                                                                <TestInstance/>
                                                                        </Test>
-                                                                       <Test name="one_r_g_zero">
+                                                                       <Test name="a_r_g_b">
                                                                                <TestInstance/>
                                                                        </Test>
                                                                </TestCase>
@@ -261296,17 +261270,19 @@
                                </TestSuite>
                        </TestSuite>
                </TestSuite>
-               <TestCase name="synchronization">
-                       <Test name="fences">
-                               <TestInstance/>
-                       </Test>
-                       <Test name="semaphores">
-                               <TestInstance/>
-                       </Test>
-                       <Test name="events">
-                               <TestInstance/>
-                       </Test>
-               </TestCase>
+               <TestSuite name="synchronization">
+                       <TestCase name="smoke">
+                               <Test name="fences">
+                                       <TestInstance/>
+                               </Test>
+                               <Test name="semaphores">
+                                       <TestInstance/>
+                               </Test>
+                               <Test name="events">
+                                       <TestInstance/>
+                               </Test>
+                       </TestCase>
+               </TestSuite>
                <TestSuite name="sparse_resources">
                        <TestCase name="buffer_sparse_binding">
                                <Test name="buffer_size_2_10">
@@ -261671,136 +261647,136 @@
                                </TestSuite>
                                <TestSuite name="cube">
                                        <TestCase name="r32i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r16i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r8i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba32ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba16ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba8ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                </TestSuite>
                                <TestSuite name="cube_array">
                                        <TestCase name="r32i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r16i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r8i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba32ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba16ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba8ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
@@ -262031,202 +262007,202 @@
                                </TestSuite>
                                <TestSuite name="cube">
                                        <TestCase name="r32i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r16i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r8i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rg32i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rg16i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rg8i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba32ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba16ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba8ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                </TestSuite>
                                <TestSuite name="cube_array">
                                        <TestCase name="r32i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r16i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r8i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rg32i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rg16i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rg8i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba32ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba16ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba8ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
@@ -262472,136 +262448,136 @@
                                </TestSuite>
                                <TestSuite name="cube">
                                        <TestCase name="r32i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r16i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r8i">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba32ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba16ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba8ui">
-                                               <Test name="512_256_1">
+                                               <Test name="256_256_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_1">
+                                               <Test name="128_128_1">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_1">
+                                               <Test name="137_137_1">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                </TestSuite>
                                <TestSuite name="cube_array">
                                        <TestCase name="r32i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r16i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="r8i">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba32ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba16ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
                                        <TestCase name="rgba8ui">
-                                               <Test name="512_256_6">
+                                               <Test name="256_256_6">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="1024_128_8">
+                                               <Test name="128_128_8">
                                                        <TestInstance/>
                                                </Test>
-                                               <Test name="11_137_3">
+                                               <Test name="137_137_3">
                                                        <TestInstance/>
                                                </Test>
                                        </TestCase>
Domain: Graphics System / GL;