diff options
author | Andreas Grois <andi@grois.info> | 2018-03-16 07:25:51 +0100 |
---|---|---|
committer | Andreas Grois <andi@grois.info> | 2018-03-16 07:25:51 +0100 |
commit | 1e54762135f3947ea961dbc0a3cb300f84a40309 (patch) | |
tree | 5a5669233925719cf703357d75d4aa22a12738b9 | |
parent | 75da6a56dc72a701fa5a058fb42702ebe4ffc9a9 (diff) | |
parent | 94de8caf4bc3edc87d4b9f92143efd4c6c0f6012 (diff) |
Merge branch 'master' into feature/01-Pausability
-rw-r--r-- | BuddhaTest/Shaders/BuddhaCompute.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BuddhaTest/Shaders/BuddhaCompute.glsl b/BuddhaTest/Shaders/BuddhaCompute.glsl index 26c7ad0..b1ce2bc 100644 --- a/BuddhaTest/Shaders/BuddhaCompute.glsl +++ b/BuddhaTest/Shaders/BuddhaCompute.glsl @@ -235,7 +235,7 @@ void main() { uint totalWorkers = totalWorkersPerDimension.x*totalWorkersPerDimension.y*totalWorkersPerDimension.z;
//TODO: Check this once I've had some sleep. Anyhow, I'm using 1D, so y and z components globalInfocationID should be zero anyhow.
- uint uniqueWorkerID = gl_GlobalInvocationID.x + gl_GlobalInvocationID.y*totalWorkersPerDimension.x + gl_GlobalInvocationID.z*(totalWorkersPerDimension.x + totalWorkersPerDimension.y);
+ uint uniqueWorkerID = gl_GlobalInvocationID.x + gl_GlobalInvocationID.y*totalWorkersPerDimension.x + gl_GlobalInvocationID.z*(totalWorkersPerDimension.x * totalWorkersPerDimension.y);
uint totalIterations = orbitLength.x > orbitLength.y ? orbitLength.x : orbitLength.y;
totalIterations = totalIterations > orbitLength.z ? totalIterations : orbitLength.z;
|