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 | |
parent | f81a6a2ff1dc34bbffd6ed34cfc49646e1bfc5f9 (diff) |
Cleanup: clang-format (re-run after v12 version bump)
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/device/device_cpu.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bssrdf.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/filter/filter_defines.h | 17 | ||||
-rw-r--r-- | intern/cycles/render/graph.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/scene.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_avxb.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_avxi.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_sseb.h | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_ssei.h | 2 |
9 files changed, 18 insertions, 19 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 0e3c771dbc3..4a6e77d6eaa 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -57,8 +57,8 @@ #include "util/util_function.h" #include "util/util_logging.h" #include "util/util_map.h" -#include "util/util_openimagedenoise.h" #include "util/util_opengl.h" +#include "util/util_openimagedenoise.h" #include "util/util_optimization.h" #include "util/util_progress.h" #include "util/util_system.h" 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 diff --git a/intern/cycles/render/graph.h b/intern/cycles/render/graph.h index 24de06123ca..5102b182593 100644 --- a/intern/cycles/render/graph.h +++ b/intern/cycles/render/graph.h @@ -356,7 +356,7 @@ class ShaderGraph : public NodeOwner { /* This function is used to create a node of a specified type instead of * calling 'new', and sets the graph as the owner of the node. */ - template<typename T, typename... Args> T *create_node(Args &&... args) + template<typename T, typename... Args> T *create_node(Args &&...args) { T *node = new T(args...); node->set_owner(this); diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 2e7fe50d5cf..7d8a6774381 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -299,7 +299,7 @@ class Scene : public NodeOwner { * node array (e.g. Scene::geometry for Geometry nodes) and tag the appropriate * manager for an update. */ - template<typename T, typename... Args> T *create_node(Args &&... args) + template<typename T, typename... Args> T *create_node(Args &&...args) { T *node = new T(args...); node->set_owner(this); diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h index 17d505c077a..15215d04ca3 100644 --- a/intern/cycles/util/util_avxb.h +++ b/intern/cycles/util/util_avxb.h @@ -57,7 +57,7 @@ struct avxb { : m256(_mm256_insertf128_ps(_mm256_castps128_ps256(a), b, 1)) { } - __forceinline operator const __m256 &(void)const + __forceinline operator const __m256 &(void) const { return m256; } diff --git a/intern/cycles/util/util_avxi.h b/intern/cycles/util/util_avxi.h index 3db646e61f4..0ae4bf271c8 100644 --- a/intern/cycles/util/util_avxi.h +++ b/intern/cycles/util/util_avxi.h @@ -54,7 +54,7 @@ struct avxi { __forceinline avxi(const __m256i a) : m256(a) { } - __forceinline operator const __m256i &(void)const + __forceinline operator const __m256i &(void) const { return m256; } diff --git a/intern/cycles/util/util_sseb.h b/intern/cycles/util/util_sseb.h index 4dbd5b8046e..6afce4f8909 100644 --- a/intern/cycles/util/util_sseb.h +++ b/intern/cycles/util/util_sseb.h @@ -57,7 +57,7 @@ struct sseb { __forceinline sseb(const __m128 input) : m128(input) { } - __forceinline operator const __m128 &(void)const + __forceinline operator const __m128 &(void) const { return m128; } diff --git a/intern/cycles/util/util_ssei.h b/intern/cycles/util/util_ssei.h index cd51dbff2f1..94412fb77e7 100644 --- a/intern/cycles/util/util_ssei.h +++ b/intern/cycles/util/util_ssei.h @@ -57,7 +57,7 @@ struct ssei { __forceinline ssei(const __m128i a) : m128(a) { } - __forceinline operator const __m128i &(void)const + __forceinline operator const __m128i &(void) const { return m128; } |