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

[Thomas Dinges]

Revision: 53823
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53823
Author:   dingto
Date:     2013-01-15 19:02:17 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Cycles:
* CUDA: Make it more clear that sm_12 and below is not supported.
* OpenCL: __KERNEL_SHADING__ was declared twice for nvidia opencl device.
* Some reshuffle of defines in kernel_types.h. No functional changes. 

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

Modified: trunk/blender/intern/cycles/device/device_cuda.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cuda.cpp	2013-01-15 17:20:52 UTC (rev 53822)
+++ trunk/blender/intern/cycles/device/device_cuda.cpp	2013-01-15 19:02:17 UTC (rev 53823)
@@ -241,7 +241,7 @@
 #ifdef _WIN32
 		if(cuHavePrecompiledKernels()) {
 			if(major <= 1 && minor <= 2)
-				cuda_error(string_printf("CUDA device supported only compute capability 1.3 or up, found %d.%d.", major, minor));
+				cuda_error(string_printf("CUDA device requires compute capability 1.3 or up, found %d.%d. Your GPU is not supported.", major, minor));
 			else
 				cuda_error(string_printf("CUDA binary kernel for this graphics card compute capability (%d.%d) not found.", major, minor));
 			return "";

Modified: trunk/blender/intern/cycles/device/device_opencl.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_opencl.cpp	2013-01-15 17:20:52 UTC (rev 53822)
+++ trunk/blender/intern/cycles/device/device_opencl.cpp	2013-01-15 19:02:17 UTC (rev 53823)
@@ -303,7 +303,7 @@
 		string build_options = " -cl-fast-relaxed-math ";
 		
 		if(platform_name == "NVIDIA CUDA")
-			build_options += "-D__KERNEL_SHADING__ -D__KERNEL_OPENCL_NVIDIA__ -cl-nv-maxrregcount=24 -cl-nv-verbose ";
+			build_options += "-D__KERNEL_OPENCL_NVIDIA__ -cl-nv-maxrregcount=24 -cl-nv-verbose ";
 
 		else if(platform_name == "Apple")
 			build_options += "-D__CL_NO_FLOAT3__ -D__KERNEL_OPENCL_APPLE__ ";

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-01-15 17:20:52 UTC (rev 53822)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-01-15 19:02:17 UTC (rev 53823)
@@ -43,11 +43,11 @@
 #ifdef __KERNEL_CPU__
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
+#define __NON_PROGRESSIVE__
+#define __HAIR__
 #ifdef WITH_OSL
 #define __OSL__
 #endif
-#define __NON_PROGRESSIVE__
-#define __HAIR__
 #endif
 
 #ifdef __KERNEL_CUDA__
@@ -112,11 +112,11 @@
 #define __TRANSPARENT_SHADOWS__
 #define __PASSES__
 #define __BACKGROUND_MIS__
+#define __LAMP_MIS__
 #define __AO__
+#define __ANISOTROPIC__
 #define __CAMERA_MOTION__
-#define __ANISOTROPIC__
 #define __OBJECT_MOTION__
-#define __LAMP_MIS__
 #endif
 //#define __SOBOL_FULL_SCREEN__