diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-04-05 20:19:51 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-04-05 20:19:51 +0400 |
| commit | d024238fb23e39edc49d13c71930b267aea833f1 (patch) | |
| tree | 8c005e2e71ed145eaa44338da6936a55d5828727 /intern | |
| parent | 6e93e3329427390c35fb93b2c5add8a639671bb6 (diff) | |
Cycles / OpenCL:
* Enable __KERNEL_SHADING__ per default for OpenCL.
This enables basic shading (color, emission, textures...) for AMD cards.
You need the latest AMD catalyst driver in order to have this work.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index f3d9aea452a..ee8070393c2 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -300,7 +300,7 @@ public: /* full shading only on NVIDIA cards at the moment */ if(platform_name == "NVIDIA CUDA") - build_options += "-D__KERNEL_SHADING__ -D__MULTI_CLOSURE__ -cl-nv-maxrregcount=24 -cl-nv-verbose "; + build_options += "-D__MULTI_CLOSURE__ -cl-nv-maxrregcount=24 -cl-nv-verbose "; if(platform_name == "Apple" || platform_name == "AMD Accelerated Parallel Processing") build_options += " -D__CL_NO_FLOAT3__ "; diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 391dcd12dad..32da7c30616 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -45,7 +45,7 @@ CCL_NAMESPACE_BEGIN #endif #ifdef __KERNEL_OPENCL__ -//#define __KERNEL_SHADING__ +#define __KERNEL_SHADING__ //#define __KERNEL_ADV_SHADING__ #endif |