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.

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index f3d9aea452a5c3fb66ef8c2539d1f3369efc3f72..ee8070393c22daa5ee39bd97505252d9ff372234 100644 (file)
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -300,7 +300,7 @@ public:
                
                /* 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__ ";
 

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 391dcd12dade928ce22465c96161fe8475743549..32da7c3061626da80c6d4b1a21370e90ea97de8c 100644 (file)
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -45,7 +45,7 @@ CCL_NAMESPACE_BEGIN
 #endif
 
 #ifdef __KERNEL_OPENCL__
-//#define __KERNEL_SHADING__
+#define __KERNEL_SHADING__
 //#define __KERNEL_ADV_SHADING__
 #endif