Commit: 8d0b3e9902540a354b633c854f0fa83a0c839dfd Author: Thomas Dinges Date: Mon Aug 25 17:22:47 2014 +0200 Branches: master https://developer.blender.org/rB8d0b3e9902540a354b633c854f0fa83a0c839dfd
Cycles: Enable Volumetric Rendering on GPU. Limitations: * Smoke/Fire rendering is *not* supported on GPU yet, that is also documented here: http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Materials/Volume * Decoupled Ray Marching is also not supported yet, so no Equi-Angular and MIS sampling yet. Note for Builders and Developers: * Make sure to use the CUDA Toolkit 6.5 from now on. 6.0 might still work, but can cause slower renders. =================================================================== M intern/cycles/kernel/kernel_types.h =================================================================== diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 3a54c68..1ed4281 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -75,10 +75,11 @@ CCL_NAMESPACE_BEGIN #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ #define __BRANCHED_PATH__ +#define __VOLUME__ +#define __VOLUME_SCATTER__ /* Experimental on GPU */ -//#define __VOLUME__ -//#define __VOLUME_SCATTER__ +//#define __VOLUME_DECOUPLED__ //#define __SUBSURFACE__ #endif _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
