From 722680d7cffd4f7ffe40799d3b1b1c5f3c2a4928 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Mon, 27 May 2013 17:13:36 +0000 Subject: 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. --- intern/cycles/device/device_opencl.cpp | 2 +- intern/cycles/kernel/kernel_types.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') 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__ -- cgit v1.2.3