From c148557cabf1fb9127b00b248479de2eb1d1d477 Mon Sep 17 00:00:00 2001
From: Cupnfish <cupnfish@icloud.com>
Date: Sat, 2 Jul 2022 15:39:42 +0800
Subject: update `wgpu` to `0.13`

---
 wgpu/src/shader/image.wgsl | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'wgpu/src/shader/image.wgsl')

diff --git a/wgpu/src/shader/image.wgsl b/wgpu/src/shader/image.wgsl
index ff304422..bb1c6b9d 100644
--- a/wgpu/src/shader/image.wgsl
+++ b/wgpu/src/shader/image.wgsl
@@ -2,26 +2,26 @@ struct Globals {
     transform: mat4x4<f32>;
 };
 
-[[group(0), binding(0)]] var<uniform> globals: Globals;
-[[group(0), binding(1)]] var u_sampler: sampler;
-[[group(1), binding(0)]] var u_texture: texture_2d_array<f32>;
+@group(0) @binding(0) var<uniform> globals: Globals;
+@group(0) @binding(1) var u_sampler: sampler;
+@group(1) @binding(0) var u_texture: texture_2d_array<f32>;
 
 struct VertexInput {
-    [[location(0)]] v_pos: vec2<f32>;
-    [[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) v_pos: vec2<f32>,
+    @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,
 };
 
 struct VertexOutput {
-    [[builtin(position)]] position: vec4<f32>;
-    [[location(0)]] uv: vec2<f32>;
-    [[location(1)]] layer: f32; // this should be an i32, but naga currently reads that as requiring interpolation.
+    @builtin(position) position: vec4<f32>,
+    @location(0) uv: vec2<f32>,
+    @location(1) layer: f32, // this should be an i32, but naga currently reads that as requiring interpolation.
 };
 
-[[stage(vertex)]]
+@vertex
 fn vs_main(input: VertexInput) -> VertexOutput {
     var out: VertexOutput;
 
@@ -40,7 +40,7 @@ fn vs_main(input: VertexInput) -> VertexOutput {
     return out;
 }
 
-[[stage(fragment)]]
-fn fs_main(input: VertexOutput) -> [[location(0)]] vec4<f32> {
+@fragment
+fn fs_main(input: VertexOutput) -> @location(0) vec4<f32> {
     return textureSample(u_texture, u_sampler, input.uv, i32(input.layer));
 }
-- 
cgit 


From a88155b2a28bfcbe39c7b87d7e9befb73a7dc8d7 Mon Sep 17 00:00:00 2001
From: Cupnfish <cupnfish@icloud.com>
Date: Sat, 2 Jul 2022 22:29:49 +0800
Subject: fix `wgsl` syntax

---
 wgpu/src/shader/image.wgsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wgpu/src/shader/image.wgsl')

diff --git a/wgpu/src/shader/image.wgsl b/wgpu/src/shader/image.wgsl
index bb1c6b9d..773ef90a 100644
--- a/wgpu/src/shader/image.wgsl
+++ b/wgpu/src/shader/image.wgsl
@@ -1,5 +1,5 @@
 struct Globals {
-    transform: mat4x4<f32>;
+    transform: mat4x4<f32>,
 };
 
 @group(0) @binding(0) var<uniform> globals: Globals;
-- 
cgit 


From 390e2a2d34d610dec057a3b6679b795e8c2a5c94 Mon Sep 17 00:00:00 2001
From: Cupnfish <cupnfish@icloud.com>
Date: Sat, 2 Jul 2022 22:51:51 +0800
Subject: better `wgsl` code style

---
 wgpu/src/shader/image.wgsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'wgpu/src/shader/image.wgsl')

diff --git a/wgpu/src/shader/image.wgsl b/wgpu/src/shader/image.wgsl
index 773ef90a..5e22cdf4 100644
--- a/wgpu/src/shader/image.wgsl
+++ b/wgpu/src/shader/image.wgsl
@@ -1,6 +1,6 @@
 struct Globals {
     transform: mat4x4<f32>,
-};
+}
 
 @group(0) @binding(0) var<uniform> globals: Globals;
 @group(0) @binding(1) var u_sampler: sampler;
@@ -13,13 +13,13 @@ struct VertexInput {
     @location(3) atlas_pos: vec2<f32>,
     @location(4) atlas_scale: vec2<f32>,
     @location(5) layer: i32,
-};
+}
 
 struct VertexOutput {
     @builtin(position) position: vec4<f32>,
     @location(0) uv: vec2<f32>,
     @location(1) layer: f32, // this should be an i32, but naga currently reads that as requiring interpolation.
-};
+}
 
 @vertex
 fn vs_main(input: VertexInput) -> VertexOutput {
-- 
cgit