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

Fix ComputeBoids (#214)

Browse Source 
I know there was some churn on which version of this shader was correct - but right now, this goes from broken on all 4 backends to working on all 4 backends. So this seems better.

The old code (accidentally?) uses descriptor arrays (I think), which are not trivial to support on all backends, so we won't use them for now.
This commit is contained in:
Kai Ninomiya 2018-07-10 11:01:28 -07:00 committed by GitHub
parent 6c639c991e
commit 7883e7e59c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
examples/ComputeBoids.cpp
View File

@ -154,12 +154,12 @@ void initSim() {
} params; } params;
layout(std140, set = 0, binding = 1) buffer ParticlesA { layout(std140, set = 0, binding = 1) buffer ParticlesA {
Particle particle; Particle particles[1000];
} particlesA[1000]; } particlesA;
layout(std140, set = 0, binding = 2) buffer ParticlesB { layout(std140, set = 0, binding = 2) buffer ParticlesB {
Particle particle; Particle particles[1000];
} particlesB[1000]; } particlesB;
void main() { void main() {
// 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
@ -167,8 +167,8 @@ void initSim() {
uint index = gl_GlobalInvocationID.x; uint index = gl_GlobalInvocationID.x;
if (index >= params.particleCount) { return; } if (index >= params.particleCount) { return; }
vec2 vPos = particlesA[index].particle.pos; vec2 vPos = particlesA.particles[index].pos;
vec2 vVel = particlesA[index].particle.vel; vec2 vVel = particlesA.particles[index].vel;
vec2 cMass = vec2(0.0, 0.0); vec2 cMass = vec2(0.0, 0.0);
vec2 cVel = vec2(0.0, 0.0); vec2 cVel = vec2(0.0, 0.0);
@ -180,8 +180,8 @@ void initSim() {
vec2 vel; vec2 vel;
for (int i = 0; i < params.particleCount; ++i) { for (int i = 0; i < params.particleCount; ++i) {
if (i == index) { continue; } if (i == index) { continue; }
pos = particlesA[i].particle.pos.xy; pos = particlesA.particles[i].pos.xy;
vel = particlesA[i].particle.vel.xy; vel = particlesA.particles[i].vel.xy;
if (distance(pos, vPos) < params.rule1Distance) { if (distance(pos, vPos) < params.rule1Distance) {
cMass += pos; cMass += pos;
@ -216,10 +216,10 @@ void initSim() {
if (vPos.y < -1.0) vPos.y = 1.0; if (vPos.y < -1.0) vPos.y = 1.0;
if (vPos.y > 1.0) vPos.y = -1.0; if (vPos.y > 1.0) vPos.y = -1.0;
particlesB[index].particle.pos = vPos; particlesB.particles[index].pos = vPos;
// Write back // Write back
particlesB[index].particle.vel = vVel; particlesB.particles[index].vel = vVel;
} }
)"); )");