Merge branch 'master' of github.com:SaschaWillems/Vulkan

2019-10-27 17:53:51 +01:00 · 2019-10-27 17:53:51 +01:00 · e1e348ac7a
commit e1e348ac7a
parent 526ed2da0e eddd724e7c
21 changed files with 1400 additions and 494 deletions
--- a/data/shaders/computenbody/particle_calculate.comp
+++ b/data/shaders/computenbody/particle_calculate.comp
@ -18,8 +18,6 @@ layout (local_size_x = 256) in;
 layout (binding = 1) uniform UBO 
 {
 	float deltaT;
-	float destX;
-	float destY;
 	int particleCount;
 } ubo;

--- a/data/shaders/computenbody/particle_calculate.comp.spv
+++ b/data/shaders/computenbody/particle_calculate.comp.spv
--- a/data/shaders/computenbody/particle_integrate.comp
+++ b/data/shaders/computenbody/particle_integrate.comp
@ -17,8 +17,6 @@ layout (local_size_x = 256) in;
 layout (binding = 1) uniform UBO 
 {
 	float deltaT;
-	float destX;
-	float destY;
 	int particleCount;
 } ubo;

--- a/data/shaders/computenbody/particle_integrate.comp.spv
+++ b/data/shaders/computenbody/particle_integrate.comp.spv