[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59934] branches/soc-2013-dingto/intern/ cycles/kernel: * Put some more volume code behind __VOLUME__.

Thomas Dinges blender at dingto.org
Mon Sep 9 03:34:40 CEST 2013


Revision: 59934
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59934
Author:   dingto
Date:     2013-09-09 01:34:39 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
* Put some more volume code behind __VOLUME__.
* Compiling on the GPU works and renders fine (sm_21 here), if you want to test uncomment the line in kernel_types.h.

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h	2013-09-09 01:02:09 UTC (rev 59933)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h	2013-09-09 01:34:39 UTC (rev 59934)
@@ -40,7 +40,9 @@
 #include "kernel_subsurface.h"
 #endif
 
+#ifdef __VOLUME__
 #include "kernel_volume.h"
+#endif
 
 CCL_NAMESPACE_BEGIN
 
@@ -666,7 +668,11 @@
 				light_ray.dP = sd.dP;
 				light_ray.dD = differential3_zero();
 
+#ifdef __VOLUME__
 				if(!shadow_blocked_new(kg, rng, rng_offset, &rng_congruential, sample, &state, &light_ray, &ao_shadow, media_volume_shader, &tmp_volume_pdf, state.bounce))
+#else
+				if(!shadow_blocked(kg, &state, &light_ray, &ao_shadow))
+#endif
 					path_radiance_accum_ao(&L, throughput, ao_bsdf, ao_shadow, state.bounce);
 			}
 		}

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h	2013-09-09 01:02:09 UTC (rev 59933)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h	2013-09-09 01:34:39 UTC (rev 59934)
@@ -69,6 +69,7 @@
 #if __CUDA_ARCH__ >= 200
 #define __KERNEL_ADV_SHADING__
 #define __BRANCHED_PATH__
+//#define __VOLUME__
 #endif
 #endif
 




More information about the Bf-blender-cvs mailing list