Merge branch 'SaschaWillems:master' into master

2022-09-26 23:23:23 -05:00 · 2022-09-26 23:23:23 -05:00 · b82ecd94a3
commit b82ecd94a3
parent 3a4ea2b697 8730b2b266
4 changed files with 15 additions and 15 deletions
--- a/data/shaders/glsl/rayquery/scene.frag
+++ b/data/shaders/glsl/rayquery/scene.frag
@ -2,7 +2,7 @@
 #extension GL_EXT_ray_tracing : enable
 #extension GL_EXT_ray_query : enable

-layout (binding = 2, set = 0) uniform accelerationStructureEXT topLevelAS;
+layout (binding = 1, set = 0) uniform accelerationStructureEXT topLevelAS;

 layout (location = 0) in vec3 inNormal;
 layout (location = 1) in vec3 inColor;
--- a/data/shaders/glsl/rayquery/scene.frag.spv
+++ b/data/shaders/glsl/rayquery/scene.frag.spv