Merge #803

803: Shader fixes with binary expressions r=kvark a=kvark Goes along with gfx-rs/naga#599 Co-authored-by: Dzmitry Malyshau <kvark@fastmail.com>
gfx-rs · Mar 19, 2021 · f7db718 · f7db718
2 parents 0f1b290 + 5aaca1c
commit f7db718
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/boids/compute.wgsl b/examples/boids/compute.wgsl
@@ -1,5 +1,5 @@
 // This should match `NUM_PARTICLES` on the Rust side.
-const NUM_PARTICLES: u32 = 1500;
+const NUM_PARTICLES: u32 = 1500u;
 
 [[block]]
 struct Particle {

diff --git a/examples/conservative-raster/upscale.wgsl b/examples/conservative-raster/upscale.wgsl
@@ -5,8 +5,8 @@ struct VertexOutput {
 
 [[stage(vertex)]]
 fn vs_main([[builtin(vertex_index)]] vertex_index: u32) -> VertexOutput {
-    const x: f32 = f32(i32(vertex_index & 1) << 2) - 1.0;
-    const y: f32 = f32(i32(vertex_index & 2) << 1) - 1.0;
+    const x: f32 = f32(i32(vertex_index & 1u) << 2u) - 1.0;
+    const y: f32 = f32(i32(vertex_index & 2u) << 1u) - 1.0;
     var output: VertexOutput;
     output.position = vec4<f32>(x, -y, 0.0, 1.0);
     output.tex_coords = vec2<f32>(x + 1.0, y + 1.0) * 0.5;

diff --git a/examples/hello-triangle/shader.wgsl b/examples/hello-triangle/shader.wgsl
@@ -1,7 +1,7 @@
 [[stage(vertex)]]
 fn vs_main([[builtin(vertex_index)]] in_vertex_index: u32) -> [[builtin(position)]] vec4<f32> {
     const x = f32(i32(in_vertex_index) - 1);
-    const y = f32(i32(in_vertex_index & 1) * 2 - 1);
+    const y = f32(i32(in_vertex_index & 1u) * 2 - 1);
     return vec4<f32>(x, y, 0.0, 1.0);
 }