[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59805] trunk/blender/intern/cycles/kernel /kernel_path.h: Code cleanup / Cycles:

Thomas Dinges blender at dingto.org
Wed Sep 4 18:11:22 CEST 2013


Revision: 59805
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59805
Author:   dingto
Date:     2013-09-04 16:11:21 +0000 (Wed, 04 Sep 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Avoid special code, when Subsurface is enabled.
Ideally we should only use the function, and get rid of the extra duplicate, but this is slower on CUDA. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_path.h

Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h	2013-09-04 15:02:59 UTC (rev 59804)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h	2013-09-04 16:11:21 UTC (rev 59805)
@@ -808,15 +808,9 @@
 			}
 		}
 #endif
-
-#ifdef __SUBSURFACE__
-
-		if(!kernel_path_integrate_lighting(kg, rng, sample, num_samples, &sd,
-			&throughput, &min_ray_pdf, &ray_pdf, &state, rng_offset, &L, &ray, &ray_t))
-			break;
-
-#else
-
+		
+		/* The following code is the same as in kernel_path_integrate_lighting(),
+		   but for CUDA the function call is slower. */
 #ifdef __EMISSION__
 		if(kernel_data.integrator.use_direct_light) {
 			/* sample illumination from lights to find path contribution */
@@ -898,8 +892,6 @@
 		ray.dP = sd.dP;
 		ray.dD = bsdf_domega_in;
 #endif
-
-#endif
 	}
 
 	float3 L_sum = path_radiance_sum(kg, &L);




More information about the Bf-blender-cvs mailing list