[Bf-blender-cvs] [53eab56] master: Cleanup: Remove some outdated comments related to split kernel.

Thomas Dinges noreply at git.blender.org
Thu May 21 20:32:59 CEST 2015


Commit: 53eab562b4adeae69e6a9f594455a7b2db47f769
Author: Thomas Dinges
Date:   Thu May 21 20:29:05 2015 +0200
Branches: master
https://developer.blender.org/rB53eab562b4adeae69e6a9f594455a7b2db47f769

Cleanup: Remove some outdated comments related to split kernel.

===================================================================

M	intern/cycles/kernel/kernel_emission.h
M	intern/cycles/kernel/kernel_shadow.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h
index 1fee583..de9e8d7 100644
--- a/intern/cycles/kernel/kernel_emission.h
+++ b/intern/cycles/kernel/kernel_emission.h
@@ -71,7 +71,6 @@ ccl_device_noinline float3 direct_emissive_eval(KernelGlobals *kg,
 	return eval;
 }
 
-/* The argument sd_DL is meaningful only for split kernel. Other uses can just pass NULL */
 ccl_device_noinline bool direct_emission(KernelGlobals *kg, ShaderData *sd,
 	LightSample *ls, Ray *ray, BsdfEval *eval, bool *is_lamp,
 	int bounce, int transparent_bounce
@@ -192,7 +191,6 @@ ccl_device_noinline float3 indirect_primitive_emission(KernelGlobals *kg, Shader
 
 /* Indirect Lamp Emission */
 
-/* The argument sd is meaningful only for split kernel. Other uses can just pass NULL */
 ccl_device_noinline bool indirect_lamp_emission(KernelGlobals *kg, PathState *state, Ray *ray, float3 *emission
 #ifdef __SPLIT_KERNEL__
                                                 ,ShaderData *sd
diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h
index 5119b7a..2811a83 100644
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -180,7 +180,6 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *
  * potentially transparent, and only in that case start marching. this gives
  * one extra ray cast for the cases were we do want transparency. */
 
-/* The arguments sd_mem and isect_mem are meaningful only for OpenCL split kernel. Other uses can just pass a NULL */
 ccl_device_inline bool shadow_blocked(KernelGlobals *kg, ccl_addr_space PathState *state, ccl_addr_space Ray *ray_input, float3 *shadow
 #ifdef __SPLIT_KERNEL__
                                       , ShaderData *sd_mem, Intersection *isect_mem




More information about the Bf-blender-cvs mailing list