summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Cupnfish <cupnfish@icloud.com>2022-07-02 22:51:51 +0800
committerLibravatar Cupnfish <cupnfish@icloud.com>2022-07-02 22:51:51 +0800
commit390e2a2d34d610dec057a3b6679b795e8c2a5c94 (patch)
tree39bd96a5d09caaddcb57d077e373050144a5df8c
parenta88155b2a28bfcbe39c7b87d7e9befb73a7dc8d7 (diff)
downloadiced-390e2a2d34d610dec057a3b6679b795e8c2a5c94.tar.gz
iced-390e2a2d34d610dec057a3b6679b795e8c2a5c94.tar.bz2
iced-390e2a2d34d610dec057a3b6679b795e8c2a5c94.zip
better `wgsl` code style
-rw-r--r--wgpu/src/shader/blit.wgsl4
-rw-r--r--wgpu/src/shader/image.wgsl6
-rw-r--r--wgpu/src/shader/quad.wgsl6
-rw-r--r--wgpu/src/shader/triangle.wgsl6
4 files changed, 11 insertions, 11 deletions
diff --git a/wgpu/src/shader/blit.wgsl b/wgpu/src/shader/blit.wgsl
index 5ff86f0a..c2ea223f 100644
--- a/wgpu/src/shader/blit.wgsl
+++ b/wgpu/src/shader/blit.wgsl
@@ -21,12 +21,12 @@ var<private> uvs: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
struct VertexInput {
@builtin(vertex_index) vertex_index: u32,
-};
+}
struct VertexOutput {
@builtin(position) position: vec4<f32>,
@location(0) uv: vec2<f32>,
-};
+}
@vertex
fn vs_main(input: VertexInput) -> VertexOutput {
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 {
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index 2e31cde3..73edd97c 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -1,7 +1,7 @@
struct Globals {
transform: mat4x4<f32>,
scale: f32,
-};
+}
@group(0) @binding(0) var<uniform> globals: Globals;
@@ -13,7 +13,7 @@ struct VertexInput {
@location(4) border_color: vec4<f32>,
@location(5) border_radius: f32,
@location(6) border_width: f32,
-};
+}
struct VertexOutput {
@builtin(position) position: vec4<f32>,
@@ -23,7 +23,7 @@ struct VertexOutput {
@location(3) scale: vec2<f32>,
@location(4) border_radius: f32,
@location(5) border_width: f32,
-};
+}
@vertex
fn vs_main(input: VertexInput) -> VertexOutput {
diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
index 4348cffd..b24402f8 100644
--- a/wgpu/src/shader/triangle.wgsl
+++ b/wgpu/src/shader/triangle.wgsl
@@ -1,18 +1,18 @@
struct Globals {
transform: mat4x4<f32>,
-};
+}
@group(0) @binding(0) var<uniform> globals: Globals;
struct VertexInput {
@location(0) position: vec2<f32>,
@location(1) color: vec4<f32>,
-};
+}
struct VertexOutput {
@builtin(position) position: vec4<f32>,
@location(0) color: vec4<f32>,
-};
+}
@vertex
fn vs_main(input: VertexInput) -> VertexOutput {