Code cleanup / Cycles: Remove CUDA check (we don't support sm_1x anymore) and unused...
authorThomas Dinges <blender@dingto.org>
Sun, 22 Dec 2013 13:43:37 +0000 (14:43 +0100)
committerThomas Dinges <blender@dingto.org>
Sun, 22 Dec 2013 13:43:37 +0000 (14:43 +0100)
intern/cycles/kernel/kernel_types.h

index 555ee13822194e1131d941744343e63b1fc09b53..fb63ebb2e7a380053c796babbb069c5db07cc945 100644 (file)
@@ -60,11 +60,9 @@ CCL_NAMESPACE_BEGIN
 
 #ifdef __KERNEL_CUDA__
 #define __KERNEL_SHADING__
-#if __CUDA_ARCH__ >= 200
 #define __KERNEL_ADV_SHADING__
 #define __BRANCHED_PATH__
 #endif
-#endif
 
 #ifdef __KERNEL_OPENCL__
 
@@ -807,8 +805,7 @@ typedef struct KernelCurves {
 
        float minimum_width;
        float maximum_width;
-       float curve_epsilon;
-       int pad2;
+       int pad2, pad3;
 } KernelCurves;
 
 typedef struct KernelBlackbody {