Merge pull request #2071 from Davidster/wgpu_webgpu_support

use @interpolate(flat) attribute as per the WebGPU spec
iced-rs · Sep 7, 2023 · d82c8b5 · d82c8b5
2 parents ccc7870 + 8780009
commit d82c8b5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
@@ -147,11 +147,11 @@ fn solid_fs_main(
 
 struct GradientVertexInput {
     @location(0) v_pos: vec2<f32>,
-    @location(1) colors_1: vec4<u32>,
-    @location(2) colors_2: vec4<u32>,
-    @location(3) colors_3: vec4<u32>,
-    @location(4) colors_4: vec4<u32>,
-    @location(5) offsets: vec4<u32>,
+    @location(1) @interpolate(flat) colors_1: vec4<u32>,
+    @location(2) @interpolate(flat) colors_2: vec4<u32>,
+    @location(3) @interpolate(flat) colors_3: vec4<u32>,
+    @location(4) @interpolate(flat) colors_4: vec4<u32>,
+    @location(5) @interpolate(flat) offsets: vec4<u32>,
     @location(6) direction: vec4<f32>,
     @location(7) position_and_scale: vec4<f32>,
     @location(8) border_color: vec4<f32>,
@@ -161,11 +161,11 @@ struct GradientVertexInput {
 
 struct GradientVertexOutput {
     @builtin(position) position: vec4<f32>,
-    @location(1) colors_1: vec4<u32>,
-    @location(2) colors_2: vec4<u32>,
-    @location(3) colors_3: vec4<u32>,
-    @location(4) colors_4: vec4<u32>,
-    @location(5) offsets: vec4<u32>,
+    @location(1) @interpolate(flat) colors_1: vec4<u32>,
+    @location(2) @interpolate(flat) colors_2: vec4<u32>,
+    @location(3) @interpolate(flat) colors_3: vec4<u32>,
+    @location(4) @interpolate(flat) colors_4: vec4<u32>,
+    @location(5) @interpolate(flat) offsets: vec4<u32>,
     @location(6) direction: vec4<f32>,
     @location(7) position_and_scale: vec4<f32>,
     @location(8) border_color: vec4<f32>,

diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
@@ -38,22 +38,22 @@ fn solid_fs_main(input: SolidVertexOutput) -> @location(0) vec4<f32> {
 
 struct GradientVertexInput {
     @location(0) v_pos: vec2<f32>,
-    @location(1) colors_1: vec4<u32>,
-    @location(2) colors_2: vec4<u32>,
-    @location(3) colors_3: vec4<u32>,
-    @location(4) colors_4: vec4<u32>,
-    @location(5) offsets: vec4<u32>,
+    @location(1) @interpolate(flat) colors_1: vec4<u32>,
+    @location(2) @interpolate(flat) colors_2: vec4<u32>,
+    @location(3) @interpolate(flat) colors_3: vec4<u32>,
+    @location(4) @interpolate(flat) colors_4: vec4<u32>,
+    @location(5) @interpolate(flat) offsets: vec4<u32>,
     @location(6) direction: vec4<f32>,
 }
 
 struct GradientVertexOutput {
     @builtin(position) position: vec4<f32>,
     @location(0) raw_position: vec2<f32>,
-    @location(1) colors_1: vec4<u32>,
-    @location(2) colors_2: vec4<u32>,
-    @location(3) colors_3: vec4<u32>,
-    @location(4) colors_4: vec4<u32>,
-    @location(5) offsets: vec4<u32>,
+    @location(1) @interpolate(flat) colors_1: vec4<u32>,
+    @location(2) @interpolate(flat) colors_2: vec4<u32>,
+    @location(3) @interpolate(flat) colors_3: vec4<u32>,
+    @location(4) @interpolate(flat) colors_4: vec4<u32>,
+    @location(5) @interpolate(flat) offsets: vec4<u32>,
     @location(6) direction: vec4<f32>,
 }