Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-12 20:33:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-03-25 15:55:42 +0300
commit700722f68633d270584af5463a804742537e30ed (patch)
tree5b80a5a51dd278e649647f8d0a64c07d570e8eaa /intern/cycles/kernel/kernel_compat_opencl.h
parent0e47e0cc9e9b19a30717042d97cb3b8fb50132ff (diff)
Cycles: Cleanup, indent nested preprocessor directives
Quite straightforward, main trick is happening in path_source_replace_includes(). Reviewers: brecht, dingto, lukasstockner97, juicyfruit Differential Revision: https://developer.blender.org/D1794
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_opencl.h')
-rw-r--r--intern/cycles/kernel/kernel_compat_opencl.h46
1 files changed, 23 insertions, 23 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h
index e8b36d2605d..a5708448e23 100644
--- a/intern/cycles/kernel/kernel_compat_opencl.h
+++ b/intern/cycles/kernel/kernel_compat_opencl.h
@@ -25,9 +25,9 @@
#define CCL_NAMESPACE_END
#ifdef __CL_NOINLINE__
-#define ccl_noinline __attribute__((noinline))
+# define ccl_noinline __attribute__((noinline))
#else
-#define ccl_noinline
+# define ccl_noinline
#endif
/* in opencl all functions are device functions, so leave this empty */
@@ -41,9 +41,9 @@
#define ccl_private __private
#ifdef __SPLIT_KERNEL__
-#define ccl_addr_space __global
+# define ccl_addr_space __global
#else
-#define ccl_addr_space
+# define ccl_addr_space
#endif
/* Selective nodes compilation. */
@@ -59,25 +59,25 @@
/* make_type definitions with opencl style element initializers */
#ifdef make_float2
-#undef make_float2
+# undef make_float2
#endif
#ifdef make_float3
-#undef make_float3
+# undef make_float3
#endif
#ifdef make_float4
-#undef make_float4
+# undef make_float4
#endif
#ifdef make_int2
-#undef make_int2
+# undef make_int2
#endif
#ifdef make_int3
-#undef make_int3
+# undef make_int3
#endif
#ifdef make_int4
-#undef make_int4
+# undef make_int4
#endif
#ifdef make_uchar4
-#undef make_uchar4
+# undef make_uchar4
#endif
#define make_float2(x, y) ((float2)(x, y))
@@ -108,19 +108,19 @@
#define fmodf(x, y) fmod((float)(x), (float)(y))
#ifndef __CL_USE_NATIVE__
-#define sinf(x) native_sin(((float)(x)))
-#define cosf(x) native_cos(((float)(x)))
-#define tanf(x) native_tan(((float)(x)))
-#define expf(x) native_exp(((float)(x)))
-#define sqrtf(x) native_sqrt(((float)(x)))
-#define logf(x) native_log(((float)(x)))
+# define sinf(x) native_sin(((float)(x)))
+# define cosf(x) native_cos(((float)(x)))
+# define tanf(x) native_tan(((float)(x)))
+# define expf(x) native_exp(((float)(x)))
+# define sqrtf(x) native_sqrt(((float)(x)))
+# define logf(x) native_log(((float)(x)))
#else
-#define sinf(x) sin(((float)(x)))
-#define cosf(x) cos(((float)(x)))
-#define tanf(x) tan(((float)(x)))
-#define expf(x) exp(((float)(x)))
-#define sqrtf(x) sqrt(((float)(x)))
-#define logf(x) log(((float)(x)))
+# define sinf(x) sin(((float)(x)))
+# define cosf(x) cos(((float)(x)))
+# define tanf(x) tan(((float)(x)))
+# define expf(x) exp(((float)(x)))
+# define sqrtf(x) sqrt(((float)(x)))
+# define logf(x) log(((float)(x)))
#endif
/* data lookup defines */