Commit: b8ffd43bd28ff93c5420d8a50c2cde5a061be118
Author: Brecht Van Lommel
Date: Fri Jul 15 13:08:51 2022 +0200
Branches: master
https://developer.blender.org/rBb8ffd43bd28ff93c5420d8a50c2cde5a061be118
Cleanup: make format
===================================================================
M intern/cycles/kernel/integrator/init_from_bake.h
M intern/cycles/kernel/integrator/intersect_shadow.h
M intern/cycles/kernel/integrator/intersect_volume_stack.h
M intern/cycles/kernel/integrator/shade_light.h
M intern/cycles/kernel/integrator/shade_shadow.h
M intern/cycles/kernel/integrator/subsurface.h
===================================================================
diff --git a/intern/cycles/kernel/integrator/init_from_bake.h
b/intern/cycles/kernel/integrator/init_from_bake.h
index 4d75dcea190..afd174de9e8 100644
--- a/intern/cycles/kernel/integrator/init_from_bake.h
+++ b/intern/cycles/kernel/integrator/init_from_bake.h
@@ -247,10 +247,12 @@ ccl_device bool integrator_init_from_bake(KernelGlobals
kg,
const bool use_raytrace_kernel = (shader_flags & SD_HAS_RAYTRACE);
if (use_caustics) {
- integrator_path_init_sorted(kg, state,
DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE, shader_index);
+ integrator_path_init_sorted(
+ kg, state, DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE,
shader_index);
}
else if (use_raytrace_kernel) {
- integrator_path_init_sorted(kg, state,
DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE, shader_index);
+ integrator_path_init_sorted(
+ kg, state, DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE,
shader_index);
}
else {
integrator_path_init_sorted(kg, state,
DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE, shader_index);
diff --git a/intern/cycles/kernel/integrator/intersect_shadow.h
b/intern/cycles/kernel/integrator/intersect_shadow.h
index adcbfa19afe..1b48b360858 100644
--- a/intern/cycles/kernel/integrator/intersect_shadow.h
+++ b/intern/cycles/kernel/integrator/intersect_shadow.h
@@ -171,7 +171,9 @@ ccl_device void integrator_intersect_shadow(KernelGlobals
kg, IntegratorShadowSt
*
* TODO: could also write to render buffer directly if no transparent
shadows?
* Could save a kernel execution for the common case. */
- integrator_shadow_path_next(kg, state,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW,
+ integrator_shadow_path_next(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW,
DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW);
return;
}
diff --git a/intern/cycles/kernel/integrator/intersect_volume_stack.h
b/intern/cycles/kernel/integrator/intersect_volume_stack.h
index 68c7fdd5909..78f0b4d62aa 100644
--- a/intern/cycles/kernel/integrator/intersect_volume_stack.h
+++ b/intern/cycles/kernel/integrator/intersect_volume_stack.h
@@ -222,7 +222,9 @@ ccl_device void
integrator_intersect_volume_stack(KernelGlobals kg, IntegratorSt
}
else {
/* Volume stack init for camera rays, continue with intersection of camera
ray. */
- integrator_path_next(kg, state,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_VOLUME_STACK,
+ integrator_path_next(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_INTERSECT_VOLUME_STACK,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST);
}
}
diff --git a/intern/cycles/kernel/integrator/shade_light.h
b/intern/cycles/kernel/integrator/shade_light.h
index 7b3e9e0ee7e..1a5ac3637f6 100644
--- a/intern/cycles/kernel/integrator/shade_light.h
+++ b/intern/cycles/kernel/integrator/shade_light.h
@@ -103,7 +103,9 @@ ccl_device void integrator_shade_light(KernelGlobals kg,
return;
}
else {
- integrator_path_next(kg, state, DEVICE_KERNEL_INTEGRATOR_SHADE_LIGHT,
+ integrator_path_next(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_SHADE_LIGHT,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_CLOSEST);
return;
}
diff --git a/intern/cycles/kernel/integrator/shade_shadow.h
b/intern/cycles/kernel/integrator/shade_shadow.h
index afe77590e9a..830da0158cf 100644
--- a/intern/cycles/kernel/integrator/shade_shadow.h
+++ b/intern/cycles/kernel/integrator/shade_shadow.h
@@ -165,7 +165,9 @@ ccl_device void integrator_shade_shadow(KernelGlobals kg,
if (shadow_intersections_has_remaining(num_hits)) {
/* More intersections to find, continue shadow ray. */
- integrator_shadow_path_next(kg, state,
DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW,
+ integrator_shadow_path_next(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_SHADE_SHADOW,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_SHADOW);
return;
}
diff --git a/intern/cycles/kernel/integrator/subsurface.h
b/intern/cycles/kernel/integrator/subsurface.h
index 09e59919c86..ab26a2d93cc 100644
--- a/intern/cycles/kernel/integrator/subsurface.h
+++ b/intern/cycles/kernel/integrator/subsurface.h
@@ -177,17 +177,23 @@ ccl_device_inline bool subsurface_scatter(KernelGlobals
kg, IntegratorState stat
const bool use_raytrace_kernel = (shader_flags & SD_HAS_RAYTRACE);
if (use_caustics) {
- integrator_path_next_sorted(kg, state,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE,
+ integrator_path_next_sorted(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE,
DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE,
shader);
}
else if (use_raytrace_kernel) {
- integrator_path_next_sorted(kg, state,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE,
+ integrator_path_next_sorted(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE,
DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE,
shader);
}
else {
- integrator_path_next_sorted(kg, state,
DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE,
+ integrator_path_next_sorted(kg,
+ state,
+ DEVICE_KERNEL_INTEGRATOR_INTERSECT_SUBSURFACE,
DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE,
shader);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
