[Bf-blender-cvs] [65ab283] master: Code cleanup / Cycles: Remove CUDA check (we don't support sm_1x anymore) and unused hair flag.

[Thomas Dinges]

Commit: 65ab2831681befa28d3a56eb62c86fb876389d94
Author: Thomas Dinges
Date:   Sun Dec 22 14:43:37 2013 +0100
http://developer.blender.org/rB65ab2831681befa28d3a56eb62c86fb876389d94

Code cleanup / Cycles: Remove CUDA check (we don't support sm_1x anymore) and 
unused hair flag.

===================================================================

M       intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h 
b/intern/cycles/kernel/kernel_types.h
index 555ee13..fb63ebb 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -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 {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs