encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-13 15:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert WGSL comments to //

Browse Source 
This CL updates the tests with WGSL sources to use // for comments
instead of #. This matches the current WGSL spec.

Change-Id: I04e1a18630a16b794955cace7e55a89221c964fe
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/37520
Auto-Submit: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
dan sinclair
2021-01-12 22:11:14 +00:00
committed by Commit Bot service account
parent 22eff1eb8c
commit e6ca254c72
9 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/ComputeBoids.cpp
View File

@@ -151,8 +151,7 @@ void initRender() {
}
void initSim() {
wgpu::ShaderModule module =
utils::CreateShaderModuleFromWGSL(device, R"(
wgpu::ShaderModule module = utils::CreateShaderModuleFromWGSL(device, R"(
[[block]] struct Particle {
[[offset(0)]] pos : vec2<f32>;
[[offset(8)]] vel : vec2<f32>;
@@ -175,7 +174,7 @@ void initSim() {
[[binding(2), set(0)]] var<storage_buffer> particlesB : [[access(read_write)]] Particles;
[[builtin(global_invocation_id)]] var<in> GlobalInvocationID : vec3<u32>;
# https://github.com/austinEng/Project6-Vulkan-Flocking/blob/master/data/shaders/computeparticles/particle.comp
// https://github.com/austinEng/Project6-Vulkan-Flocking/blob/master/data/shaders/computeparticles/particle.comp
[[stage(compute)]]
fn main() -> void {
var index : u32 = GlobalInvocationID.x;
@@ -222,12 +221,12 @@ void initSim() {
vVel = vVel + (cMass * params.rule1Scale) + (colVel * params.rule2Scale) +
(cVel * params.rule3Scale);
# clamp velocity for a more pleasing simulation
// clamp velocity for a more pleasing simulation
vVel = normalize(vVel) * clamp(length(vVel), 0.0, 0.1);
# kinematic update
// kinematic update
vPos = vPos + (vVel * params.deltaT);
# Wrap around boundary
// Wrap around boundary
if (vPos.x < -1.0) {
vPos.x = 1.0;
}
@@ -241,7 +240,7 @@ void initSim() {
vPos.y = -1.0;
}
# Write back
// Write back
particlesB.particles[index].pos = vPos;
particlesB.particles[index].vel = vVel;
return;