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

[Thomas Dinges]

Revision: 45429
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45429
Author:   dingto
Date:     2012-04-05 16:19:51 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
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. 

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	2012-04-05 15:17:45 UTC (rev 45428)
+++ trunk/blender/intern/cycles/device/device_opencl.cpp	2012-04-05 16:19:51 UTC (rev 45429)
@@ -300,7 +300,7 @@
 		
 		/* 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__ ";
 

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-04-05 15:17:45 UTC (rev 45428)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-04-05 16:19:51 UTC (rev 45429)
@@ -45,7 +45,7 @@
 #endif
 
 #ifdef __KERNEL_OPENCL__
-//#define __KERNEL_SHADING__
+#define __KERNEL_SHADING__
 //#define __KERNEL_ADV_SHADING__
 #endif