Cycles / OpenCL:
authorThomas Dinges <blender@dingto.org>
Mon, 27 May 2013 17:13:36 +0000 (17:13 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 27 May 2013 17:13:36 +0000 (17:13 +0000)
* 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
intern/cycles/kernel/kernel_types.h

index 8e14c281155c0d70be99d4d6e9f9b2ba04c79028..1cd538d655fef850ef0b5b551911c28fb4ffd577 100644 (file)
@@ -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")
index 1dcd3a52b6af8117698267e5d71765acfd3653f3..96fb17282e5f5f43b21d00bb1156729aa498919f 100644 (file)
@@ -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__