Fix broken first-bounce random seed

juliusikkala · juliusikkala · commit 82120582c0af · 2022-10-11T19:10:38.000+03:00
diff --git a/external/fuchsia_radix_sort b/external/fuchsia_radix_sort
@@ -1 +1 @@
-Subproject commit 4165014fb8dd77effeb046a874236e15113dd4de
+Subproject commit 828b329ec6f49fbb64bff3bc118bea46f18e5e4a
diff --git a/shader/random_sampler.glsl b/shader/random_sampler.glsl
@@ -29,7 +29,7 @@ random_sampler init_random_sampler(
     uvec4 coord, uvec3 size
 ){
     random_sampler rsampler;
-    rsampler.seed = coord;
+    rsampler.seed = pcg4d(coord);
     return rsampler;
 }
 
diff --git a/shader/sampling_sobol_owen.glsl b/shader/sampling_sobol_owen.glsl
@@ -90,7 +90,7 @@ vec4 get_shuffled_scrambled_sobol_pt(sobol_sampler ssampler, uint bounce)
 sobol_sampler init_sobol_sampler(uvec4 seed)
 {
     sobol_sampler ssampler;
-    ssampler.seed = seed;
+    ssampler.seed = pcg4d(seed);
     return ssampler;
 }
 #endif
diff --git a/src/aabb_scene.cc b/src/aabb_scene.cc
@@ -183,12 +183,10 @@ void aabb_scene::init_acceleration_structures(const char* timer_name)
             vk::BuildAccelerationStructureFlagBitsKHR::ePreferFastTrace|
             vk::BuildAccelerationStructureFlagBitsKHR::eAllowUpdate,
             vk::BuildAccelerationStructureModeKHR::eBuild,
-            {},
-            {},
+            VK_NULL_HANDLE,
+            VK_NULL_HANDLE,
             1,
-            &geom,
-            {},
-            {}
+            &geom
         );
 
         vk::AccelerationStructureBuildSizesInfoKHR size_info =
diff --git a/src/context.hh b/src/context.hh
@@ -7,6 +7,7 @@
 #include "render_target.hh"
 #include <set>
 #include <map>
+#include <memory>
 #include <chrono>
 #include <functional>
 
diff --git a/src/mesh.cc b/src/mesh.cc
@@ -40,12 +40,10 @@ void build_acceleration_structure(
         vk::AccelerationStructureTypeKHR::eBottomLevel,
         {},
         vk::BuildAccelerationStructureModeKHR::eBuild,
-        {},
-        {},
+        VK_NULL_HANDLE,
+        VK_NULL_HANDLE,
         1,
-        &geom,
-        {},
-        {}
+        &geom
     );
 
     if(static_as)
diff --git a/src/scene.cc b/src/scene.cc
@@ -346,12 +346,10 @@ void scene::init_tlas(size_t i)
         vk::BuildAccelerationStructureFlagBitsKHR::ePreferFastTrace|
         vk::BuildAccelerationStructureFlagBitsKHR::eAllowUpdate,
         vk::BuildAccelerationStructureModeKHR::eBuild,
-        {},
-        {},
+        VK_NULL_HANDLE,
+        VK_NULL_HANDLE,
         1,
-        &geom,
-        {},
-        {}
+        &geom
     );
 
     vk::AccelerationStructureBuildSizesInfoKHR size_info =

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ random_sampler init_random_sampler(`
`29`	`29`	`uvec4 coord, uvec3 size`
`30`	`30`	`){`
`31`	`31`	`random_sampler rsampler;`
`32`		`- rsampler.seed = coord;`
	`32`	`+ rsampler.seed = pcg4d(coord);`
`33`	`33`	`return rsampler;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ vec4 get_shuffled_scrambled_sobol_pt(sobol_sampler ssampler, uint bounce)`
`90`	`90`	`sobol_sampler init_sobol_sampler(uvec4 seed)`
`91`	`91`	`{`
`92`	`92`	`sobol_sampler ssampler;`
`93`		`- ssampler.seed = seed;`
	`93`	`+ ssampler.seed = pcg4d(seed);`
`94`	`94`	`return ssampler;`
`95`	`95`	`}`
`96`	`96`	`#endif`