Reassign attribute locations for image shader

wgpu/src/image.rs

@@ -218,11 +218,16 @@ impl Pipeline {
                         array_stride: mem::size_of::<Instance>() as u64,
                         step_mode: wgpu::VertexStepMode::Instance,
                         attributes: &wgpu::vertex_attr_array!(
+                            // Position
+                            0 => Float32x2,
+                            // Scale
                             1 => Float32x2,
+                            // Atlas position
                             2 => Float32x2,
+                            // Atlas scale
                             3 => Float32x2,
-                            4 => Float32x2,
-                            5 => Sint32,
+                            // Layer
+                            4 => Sint32,
                         ),
                     }],
                 },

wgpu/src/shader/image.wgsl

@@ -8,11 +8,11 @@ struct Globals {
 
 struct VertexInput {
     @builtin(vertex_index) vertex_index: u32,
-    @location(1) pos: vec2<f32>,
-    @location(2) scale: vec2<f32>,
-    @location(3) atlas_pos: vec2<f32>,
-    @location(4) atlas_scale: vec2<f32>,
-    @location(5) layer: i32,
+    @location(0) pos: vec2<f32>,
+    @location(1) scale: vec2<f32>,
+    @location(2) atlas_pos: vec2<f32>,
+    @location(3) atlas_scale: vec2<f32>,
+    @location(4) layer: i32,
 }
 
 struct VertexOutput {