[Bf-blender-cvs] [8482dbf7b07] cycles_path_guiding: Fix build error for Metal
Brecht Van Lommel
noreply at git.blender.org
Fri Sep 23 16:06:59 CEST 2022
Commit: 8482dbf7b075b77fea1e9b97e7051f3f417487ae
Author: Brecht Van Lommel
Date: Fri Sep 23 16:06:23 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rB8482dbf7b075b77fea1e9b97e7051f3f417487ae
Fix build error for Metal
===================================================================
M intern/cycles/kernel/integrator/shadow_state_template.h
M intern/cycles/kernel/integrator/state_template.h
===================================================================
diff --git a/intern/cycles/kernel/integrator/shadow_state_template.h b/intern/cycles/kernel/integrator/shadow_state_template.h
index f28430d99b7..d731d1df339 100644
--- a/intern/cycles/kernel/integrator/shadow_state_template.h
+++ b/intern/cycles/kernel/integrator/shadow_state_template.h
@@ -48,7 +48,7 @@ KERNEL_STRUCT_MEMBER(shadow_path,
path_segment,
KERNEL_FEATURE_PATH_GUIDING)
#else
-KERNEL_STRUCT_MEMBER(shadow_path, void *, path_segment, KERNEL_FEATURE_PATH_GUIDING)
+KERNEL_STRUCT_MEMBER(shadow_path, uint64_t, path_segment, KERNEL_FEATURE_PATH_GUIDING)
#endif
KERNEL_STRUCT_END(shadow_path)
diff --git a/intern/cycles/kernel/integrator/state_template.h b/intern/cycles/kernel/integrator/state_template.h
index d04292ec080..bf7bd89baaa 100644
--- a/intern/cycles/kernel/integrator/state_template.h
+++ b/intern/cycles/kernel/integrator/state_template.h
@@ -130,11 +130,11 @@ KERNEL_STRUCT_END(guiding)
#else
KERNEL_STRUCT_BEGIN(guiding)
/* Current path segment of the random walk/path. */
-KERNEL_STRUCT_MEMBER(guiding, void *, path_segment, KERNEL_FEATURE_PATH_GUIDING)
+KERNEL_STRUCT_MEMBER(guiding, uint64_t, path_segment, KERNEL_FEATURE_PATH_GUIDING)
/* Guided sampling distribution for sampling new directions at a position on a surface. */
-KERNEL_STRUCT_MEMBER(guiding, void *, surface_sampling_distribution, KERNEL_FEATURE_PATH_GUIDING)
+KERNEL_STRUCT_MEMBER(guiding, uint64_t, surface_sampling_distribution, KERNEL_FEATURE_PATH_GUIDING)
/* Guided sampling distribution for sampling new directions at position inside a volume. */
-KERNEL_STRUCT_MEMBER(guiding, void *, volume_sampling_distribution, KERNEL_FEATURE_PATH_GUIDING)
+KERNEL_STRUCT_MEMBER(guiding, uint64_t, volume_sampling_distribution, KERNEL_FEATURE_PATH_GUIDING)
/* If surface guiding is enabled */
KERNEL_STRUCT_MEMBER(guiding, bool, use_surface_guiding, KERNEL_FEATURE_PATH_GUIDING)
/* Random number used for additional guiding decisions (e.g., cache query, selection to use guiding
More information about the Bf-blender-cvs
mailing list