diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-01-15 23:02:17 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-01-15 23:02:17 +0400 |
| commit | f146317b092990b65437ecc5ac85d0a659e81ee4 (patch) | |
| tree | 39dfcc7e904b7b26a39f48a3e6bff14dcaef0dda /intern | |
| parent | 039db0906d741fc8b3c55c9448b0f707d2075dd2 (diff) | |
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.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index ae540710b50..0c590645808 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -241,7 +241,7 @@ public: #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 ""; diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 69287f1a8bd..3ab5d9ee69b 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -303,7 +303,7 @@ public: 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__ "; diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index dcd7220be1d..149a4470515 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -43,11 +43,11 @@ CCL_NAMESPACE_BEGIN #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 @@ CCL_NAMESPACE_BEGIN #define __TRANSPARENT_SHADOWS__ #define __PASSES__ #define __BACKGROUND_MIS__ +#define __LAMP_MIS__ #define __AO__ -#define __CAMERA_MOTION__ #define __ANISOTROPIC__ +#define __CAMERA_MOTION__ #define __OBJECT_MOTION__ -#define __LAMP_MIS__ #endif //#define __SOBOL_FULL_SCREEN__ |