diff --git a/projects/saf_r/shaders/raytracing.comp b/projects/saf_r/shaders/raytracing.comp index e43d6ed1a0317f851323b4f562906f38f4af93fd..4cb9ae9c788e7d4a3e8f903e0822887a41b64578 100644 --- a/projects/saf_r/shaders/raytracing.comp +++ b/projects/saf_r/shaders/raytracing.comp @@ -34,9 +34,9 @@ layout(std430, binding = 1) coherent buffer spheres{ layout(set=0, binding = 2, rgba8) uniform image2D outImage; layout( push_constant ) uniform constants{ - float lightCount; - float matCount; - float sphereCount; + int lightCount; + int matCount; + int sphereCount; }; bool ray_intersect(const vec3 origin, const vec3 dir, out float t0, const int id){ @@ -125,7 +125,6 @@ vec3 computeHitLighting(Intersection intersection, vec3 V, out float outReflecti vec3 castRay(const vec3 initialOrigin, const vec3 initialDirection, int max_depth) { vec3 skyColor = vec3(0.2, 0.7, 0.8); - vec3 rayOrigin = initialOrigin; vec3 rayDirection = initialDirection; diff --git a/projects/saf_r/src/main.cpp b/projects/saf_r/src/main.cpp index 27dfafbd5e90c7774fb6d5d23a55f357f0160b33..387db3fa9fc958f64b322bcfc4bdeb63fc1a353b 100644 --- a/projects/saf_r/src/main.cpp +++ b/projects/saf_r/src/main.cpp @@ -133,8 +133,8 @@ int main(int argc, const char** argv) { ); sphereBuffer.fill(spheres); - glm::vec3 pushData = glm::vec3((lights.size()), (materials.size()), (spheres.size())); - vkcv::PushConstants pushConstantsCompute(sizeof(glm::vec3)); + glm::ivec3 pushData = glm::ivec3((lights.size()), (materials.size()), (spheres.size())); + vkcv::PushConstants pushConstantsCompute(sizeof(glm::ivec3)); pushConstantsCompute.appendDrawcall(pushData); vkcv::DescriptorWrites setWrites;