diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-05-27 21:13:36 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-05-27 21:13:36 +0400 |
| commit | 722680d7cffd4f7ffe40799d3b1b1c5f3c2a4928 (patch) | |
| tree | 9ba35727aaee725c675a1a1de81eb8bf88cbd2ed /intern/cycles | |
| parent | bb15701f863fbe0a40bdddc19ef949f5c59fe88b (diff) | |
Cycles / OpenCL:
* Use advanced shading for nvidia as well, works fine on my Geforce 540M with sm_21.
I tested the files from regression suite.
Diffstat (limited to 'intern/cycles')
| -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 8e14c281155..1cd538d655f 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -69,7 +69,7 @@ static bool opencl_kernel_use_advanced_shading(const string& platform) { /* keep this in sync with kernel_types.h! */ if(platform == "NVIDIA CUDA") - return false; + return true; else if(platform == "Apple") return false; else if(platform == "AMD Accelerated Parallel Processing") diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 1dcd3a52b6a..96fb17282e5 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -70,7 +70,7 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_OPENCL_NVIDIA__ #define __KERNEL_SHADING__ -//#define __KERNEL_ADV_SHADING__ +#define __KERNEL_ADV_SHADING__ #endif #ifdef __KERNEL_OPENCL_APPLE__ |