[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57056] trunk/blender/intern/cycles: Cycles / OpenCL:

[Thomas Dinges]

Revision: 57056
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57056
Author:   dingto
Date:     2013-05-27 17:13:36 +0000 (Mon, 27 May 2013)
Log Message:
-----------
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. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/device/device_opencl.cpp
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/device/device_opencl.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_opencl.cpp	2013-05-27 17:11:05 UTC (rev 57055)
+++ trunk/blender/intern/cycles/device/device_opencl.cpp	2013-05-27 17:13:36 UTC (rev 57056)
@@ -69,7 +69,7 @@
 {
 	/* 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")

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-05-27 17:11:05 UTC (rev 57055)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-05-27 17:13:36 UTC (rev 57056)
@@ -70,7 +70,7 @@
 
 #ifdef __KERNEL_OPENCL_NVIDIA__
 #define __KERNEL_SHADING__
-//#define __KERNEL_ADV_SHADING__
+#define __KERNEL_ADV_SHADING__
 #endif
 
 #ifdef __KERNEL_OPENCL_APPLE__