diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-07-30 09:19:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-30 09:19:19 +0300 |
commit | 93eb460dd0aca4de33bf780de76eee319c224bae (patch) | |
tree | 8ee44df80044964ee00bb1217d00623fd928d891 /intern/cycles/kernel | |
parent | f81a6a2ff1dc34bbffd6ed34cfc49646e1bfc5f9 (diff) |
Cleanup: clang-format (re-run after v12 version bump)
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/closure/bssrdf.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/filter/filter_defines.h | 17 |
2 files changed, 11 insertions, 12 deletions
diff --git a/intern/cycles/kernel/closure/bssrdf.h b/intern/cycles/kernel/closure/bssrdf.h index de65451d82c..562daf1286d 100644 --- a/intern/cycles/kernel/closure/bssrdf.h +++ b/intern/cycles/kernel/closure/bssrdf.h @@ -432,9 +432,9 @@ ccl_device void bssrdf_sample(const ShaderClosure *sc, float xi, float *r, float xi *= bssrdf->channels; if (xi < 1.0f) { - radius = (bssrdf->radius.x > 0.0f) ? - bssrdf->radius.x : - (bssrdf->radius.y > 0.0f) ? bssrdf->radius.y : bssrdf->radius.z; + radius = (bssrdf->radius.x > 0.0f) ? bssrdf->radius.x : + (bssrdf->radius.y > 0.0f) ? bssrdf->radius.y : + bssrdf->radius.z; } else if (xi < 2.0f) { xi -= 1.0f; diff --git a/intern/cycles/kernel/filter/filter_defines.h b/intern/cycles/kernel/filter/filter_defines.h index 0e51eeef92f..1c0ac5e2cb7 100644 --- a/intern/cycles/kernel/filter/filter_defines.h +++ b/intern/cycles/kernel/filter/filter_defines.h @@ -52,15 +52,14 @@ typedef struct TileInfo { tile_buffer_6, tile_buffer_7, tile_buffer_8, tile_buffer_9 # define ccl_get_tile_buffer(id) \ (id == 0 ? tile_buffer_1 : \ - id == 1 ? \ - tile_buffer_2 : \ - id == 2 ? \ - tile_buffer_3 : \ - id == 3 ? tile_buffer_4 : \ - id == 4 ? tile_buffer_5 : \ - id == 5 ? tile_buffer_6 : \ - id == 6 ? tile_buffer_7 : \ - id == 7 ? tile_buffer_8 : tile_buffer_9) + id == 1 ? tile_buffer_2 : \ + id == 2 ? tile_buffer_3 : \ + id == 3 ? tile_buffer_4 : \ + id == 4 ? tile_buffer_5 : \ + id == 5 ? tile_buffer_6 : \ + id == 6 ? tile_buffer_7 : \ + id == 7 ? tile_buffer_8 : \ + tile_buffer_9) #else # ifdef __KERNEL_CUDA__ # define CCL_FILTER_TILE_INFO ccl_global TileInfo *tile_info |