github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Merge #803

Browse Source 
803: Shader fixes with binary expressions r=kvark a=kvark

Goes along with https://github.com/gfx-rs/naga/pull/599

Co-authored-by: Dzmitry Malyshau <kvark@fastmail.com>
This commit is contained in:
bors[bot]
2021-03-19 05:36:54 +00:00
committed by GitHub
parent c45ea6f5b1 b9c60811f8
commit b3bc3d02e0
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu/examples/boids/compute.wgsl
View File

@@ -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 {

4
wgpu/examples/conservative-raster/upscale.wgsl
View File

@@ -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;

2
wgpu/examples/hello-triangle/shader.wgsl
View File

@@ -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);
}