diff options
Diffstat (limited to 'intern/cycles/kernel/bvh/bvh_types.h')
-rw-r--r-- | intern/cycles/kernel/bvh/bvh_types.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/intern/cycles/kernel/bvh/bvh_types.h b/intern/cycles/kernel/bvh/bvh_types.h index 4ca0dc2225e..16f3b03f842 100644 --- a/intern/cycles/kernel/bvh/bvh_types.h +++ b/intern/cycles/kernel/bvh/bvh_types.h @@ -35,13 +35,13 @@ CCL_NAMESPACE_BEGIN #define BVH_OSTACK_SIZE 768 /* BVH intersection function variations */ -#define BVH_INSTANCING 1 -#define BVH_MOTION 2 -#define BVH_HAIR 4 -#define BVH_HAIR_MINIMUM_WIDTH 8 +#define BVH_INSTANCING 1 +#define BVH_MOTION 2 +#define BVH_HAIR 4 +#define BVH_HAIR_MINIMUM_WIDTH 8 -#define BVH_NAME_JOIN(x,y) x ## _ ## y -#define BVH_NAME_EVAL(x,y) BVH_NAME_JOIN(x,y) +#define BVH_NAME_JOIN(x, y) x##_##y +#define BVH_NAME_EVAL(x, y) BVH_NAME_JOIN(x, y) #define BVH_FUNCTION_FULL_NAME(prefix) BVH_NAME_EVAL(prefix, BVH_FUNCTION_NAME) #define BVH_FEATURE(f) (((BVH_FUNCTION_FEATURES) & (f)) != 0) @@ -49,30 +49,30 @@ CCL_NAMESPACE_BEGIN /* Debugging heleprs */ #ifdef __KERNEL_DEBUG__ # define BVH_DEBUG_INIT() \ - do { \ - isect->num_traversed_nodes = 0; \ - isect->num_traversed_instances = 0; \ - isect->num_intersections = 0; \ - } while(0) + do { \ + isect->num_traversed_nodes = 0; \ + isect->num_traversed_instances = 0; \ + isect->num_intersections = 0; \ + } while (0) # define BVH_DEBUG_NEXT_NODE() \ - do { \ - ++isect->num_traversed_nodes; \ - } while(0) + do { \ + ++isect->num_traversed_nodes; \ + } while (0) # define BVH_DEBUG_NEXT_INTERSECTION() \ - do { \ - ++isect->num_intersections; \ - } while(0) + do { \ + ++isect->num_intersections; \ + } while (0) # define BVH_DEBUG_NEXT_INSTANCE() \ - do { \ - ++isect->num_traversed_instances; \ - } while(0) -#else /* __KERNEL_DEBUG__ */ + do { \ + ++isect->num_traversed_instances; \ + } while (0) +#else /* __KERNEL_DEBUG__ */ # define BVH_DEBUG_INIT() # define BVH_DEBUG_NEXT_NODE() # define BVH_DEBUG_NEXT_INTERSECTION() # define BVH_DEBUG_NEXT_INSTANCE() -#endif /* __KERNEL_DEBUG__ */ +#endif /* __KERNEL_DEBUG__ */ CCL_NAMESPACE_END -#endif /* __BVH_TYPES__ */ +#endif /* __BVH_TYPES__ */ |