summaryrefslogtreecommitdiffstats
path: root/wgpu/src/shader/image.wgsl
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu/src/shader/image.wgsl')
-rw-r--r--wgpu/src/shader/image.wgsl38
1 files changed, 19 insertions, 19 deletions
diff --git a/wgpu/src/shader/image.wgsl b/wgpu/src/shader/image.wgsl
index ff304422..5e22cdf4 100644
--- a/wgpu/src/shader/image.wgsl
+++ b/wgpu/src/shader/image.wgsl
@@ -1,27 +1,27 @@
struct Globals {
- transform: mat4x4<f32>;
-};
+ 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));
}