fix conflict on ron files

gfx-rs · Jun 22, 2024 · 6d1b715 · 6d1b715
1 parent d18f03c
commit 6d1b715
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 101 deletions.
diff --git a/naga/tests/out/ir/atomic_i_increment.compact.ron b/naga/tests/out/ir/atomic_i_increment.compact.ron
@@ -20,7 +20,7 @@
                 members: [
                     (
                         name: None,
-                        ty: 1,
+                        ty: 0,
                         binding: None,
                         offset: 0,
                     ),
@@ -41,7 +41,7 @@
                 members: [
                     (
                         name: None,
-                        ty: 4,
+                        ty: 3,
                         binding: None,
                         offset: 0,
                     ),
@@ -56,14 +56,19 @@
         predeclared_types: {},
     ),
     constants: [
+        (
+            name: None,
+            ty: 0,
+            init: 0,
+        ),
         (
             name: None,
             ty: 1,
             init: 1,
         ),
         (
             name: None,
-            ty: 2,
+            ty: 0,
             init: 2,
         ),
         (
@@ -73,14 +78,9 @@
         ),
         (
             name: None,
-            ty: 2,
+            ty: 0,
             init: 4,
         ),
-        (
-            name: None,
-            ty: 1,
-            init: 5,
-        ),
     ],
     overrides: [],
     global_variables: [
@@ -93,7 +93,7 @@
                 group: 0,
                 binding: 0,
             )),
-            ty: 5,
+            ty: 4,
             init: None,
         ),
         (
@@ -105,7 +105,7 @@
                 group: 0,
                 binding: 1,
             )),
-            ty: 3,
+            ty: 2,
             init: None,
         ),
     ],
@@ -114,7 +114,7 @@
         Literal(Bool(false)),
         Literal(U32(1)),
         Literal(Bool(true)),
-        ZeroValue(1),
+        ZeroValue(0),
     ],
     functions: [
         (
@@ -124,68 +124,68 @@
             local_variables: [
                 (
                     name: Some("phi_23"),
-                    ty: 1,
+                    ty: 0,
                     init: None,
                 ),
                 (
                     name: Some("phi_24"),
-                    ty: 1,
+                    ty: 0,
                     init: None,
                 ),
             ],
             expressions: [
+                GlobalVariable(0),
                 GlobalVariable(1),
-                GlobalVariable(2),
-                Constant(4),
-                Constant(2),
-                Constant(5),
                 Constant(3),
                 Constant(1),
+                Constant(4),
+                Constant(2),
+                Constant(0),
                 AccessIndex(
-                    base: 1,
+                    base: 0,
                     index: 0,
                 ),
                 AccessIndex(
-                    base: 2,
+                    base: 1,
                     index: 0,
                 ),
-                LocalVariable(1),
+                LocalVariable(0),
                 Load(
-                    pointer: 10,
+                    pointer: 9,
                 ),
                 Load(
-                    pointer: 9,
+                    pointer: 8,
                 ),
                 Binary(
                     op: GreaterEqual,
-                    left: 11,
-                    right: 12,
+                    left: 10,
+                    right: 11,
                 ),
                 AtomicResult(
-                    ty: 1,
+                    ty: 0,
                     comparison: false,
                 ),
                 Literal(U32(1)),
                 Binary(
                     op: Add,
-                    left: 11,
-                    right: 6,
+                    left: 10,
+                    right: 5,
                 ),
-                LocalVariable(2),
+                LocalVariable(1),
                 Load(
-                    pointer: 17,
+                    pointer: 16,
                 ),
                 Select(
-                    condition: 13,
-                    accept: 4,
-                    reject: 3,
+                    condition: 12,
+                    accept: 3,
+                    reject: 2,
                 ),
                 Unary(
                     op: LogicalNot,
-                    expr: 19,
+                    expr: 18,
                 ),
+                LocalVariable(0),
                 LocalVariable(1),
-                LocalVariable(2),
             ],
             named_expressions: {},
             body: [
@@ -194,8 +194,8 @@
                     end: 9,
                 )),
                 Store(
-                    pointer: 21,
-                    value: 7,
+                    pointer: 20,
+                    value: 6,
                 ),
                 Loop(
                     body: [
@@ -208,11 +208,11 @@
                             end: 13,
                         )),
                         If(
-                            condition: 13,
+                            condition: 12,
                             accept: [
                                 Store(
-                                    pointer: 22,
-                                    value: 5,
+                                    pointer: 21,
+                                    value: 4,
                                 ),
                             ],
                             reject: [
@@ -221,18 +221,18 @@
                                     end: 14,
                                 )),
                                 Atomic(
-                                    pointer: 8,
+                                    pointer: 7,
                                     fun: Add,
-                                    value: 15,
-                                    result: Some(14),
+                                    value: 14,
+                                    result: Some(13),
                                 ),
                                 Emit((
                                     start: 15,
                                     end: 16,
                                 )),
                                 Store(
-                                    pointer: 22,
-                                    value: 16,
+                                    pointer: 21,
+                                    value: 15,
                                 ),
                             ],
                         ),
@@ -248,11 +248,11 @@
                             end: 20,
                         )),
                         Store(
-                            pointer: 21,
-                            value: 18,
+                            pointer: 20,
+                            value: 17,
                         ),
                     ],
-                    break_if: Some(20),
+                    break_if: Some(19),
                 ),
                 Return(
                     value: None,
@@ -275,7 +275,7 @@
                 named_expressions: {},
                 body: [
                     Call(
-                        function: 1,
+                        function: 0,
                         arguments: [],
                         result: None,
                     ),