diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-12 20:33:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-25 15:55:42 +0300 |
| commit | 700722f68633d270584af5463a804742537e30ed (patch) | |
| tree | 5b80a5a51dd278e649647f8d0a64c07d570e8eaa /intern/cycles/kernel/svm/svm_image.h | |
| parent | 0e47e0cc9e9b19a30717042d97cb3b8fb50132ff (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/svm/svm_image.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 86d3262795f..8f2b9423b2c 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -133,13 +133,13 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, uint srgb, uint use_alpha) { #ifdef __KERNEL_CPU__ -#ifdef __KERNEL_SSE2__ +# ifdef __KERNEL_SSE2__ ssef r_ssef; float4 &r = (float4 &)r_ssef; r = kernel_tex_image_interp(id, x, y); -#else +# else float4 r = kernel_tex_image_interp(id, x, y); -#endif +# endif #else float4 r; @@ -247,7 +247,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, case 91: r = kernel_tex_image_interp(__tex_image_091, x, y); break; case 92: r = kernel_tex_image_interp(__tex_image_092, x, y); break; -#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300) +# if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300) case 93: r = kernel_tex_image_interp(__tex_image_093, x, y); break; case 94: r = kernel_tex_image_interp(__tex_image_094, x, y); break; case 95: r = kernel_tex_image_interp(__tex_image_095, x, y); break; @@ -306,7 +306,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, case 148: r = kernel_tex_image_interp(__tex_image_148, x, y); break; case 149: r = kernel_tex_image_interp(__tex_image_149, x, y); break; case 150: r = kernel_tex_image_interp(__tex_image_150, x, y); break; -#endif +# endif default: kernel_assert(0); |