Commit: f472824a71bbe8379a17e9116dacd6547464b5fb Author: varunsundar08 Date: Tue May 5 05:33:04 2015 +0530 Branches: cycles_kernel_split https://developer.blender.org/rBf472824a71bbe8379a17e9116dacd6547464b5fb
Remove ShaderData variable count macros =================================================================== M intern/cycles/device/device_opencl.cpp =================================================================== diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 58b1b21..56ff220 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -60,19 +60,6 @@ CCL_NAMESPACE_BEGIN */ #define DATA_ALLOCATION_MEM_FACTOR 5000000 //5MB -/* Shader data variable count - To calculate ShaderData size */ -#define SD_NUM_FLOAT3 5 -#ifdef __DPDU__ -#define SD_NUM_DPDU_FLOAT3 2 -#endif -#define SD_NUM_INT 8 -#define SD_NUM_FLOAT 5 -#ifdef __RAY_DIFFERENTIALS__ -#define SD_NUM_RAY_DIFFERENTIALS_DIFFERENTIAL3 2 -#define SD_NUM_DIFFERENTIAL 2 -#endif -#define SD_NUM_RAY_DP_DIFFERENTIAL3 1 - static cl_device_type opencl_device_type() { char *device = getenv("CYCLES_OPENCL_TEST"); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs