diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-05 19:21:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-05 19:21:27 +0300 |
commit | ffec86bb62c52665ef6a05770f03ab69fa6bb231 (patch) | |
tree | 6d080aee3dc00c1145b4d009de6e0c1f47366594 /intern | |
parent | 3a8d9198b33d9c90abd3a134ee26e2f68ff52002 (diff) |
Cleanup: clang-format
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/cmake/msvc_arch_flags.c | 14 | ||||
-rw-r--r-- | intern/cycles/kernel/shaders/node_voronoi_texture.osl | 3 | ||||
-rw-r--r-- | intern/cycles/render/shader.h | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/intern/cycles/cmake/msvc_arch_flags.c b/intern/cycles/cmake/msvc_arch_flags.c index 79dbd3b87ac..22fcc2c437a 100644 --- a/intern/cycles/cmake/msvc_arch_flags.c +++ b/intern/cycles/cmake/msvc_arch_flags.c @@ -14,25 +14,25 @@ * limitations under the License. */ -#include <stdio.h> #include <isa_availability.h> +#include <stdio.h> /* The MS CRT defines this */ extern int __isa_available; -const char* get_arch_flags() +const char *get_arch_flags() { - if (__isa_available >= __ISA_AVAILABLE_AVX2) { + if (__isa_available >= __ISA_AVAILABLE_AVX2) { return "/arch:AVX2"; } - if (__isa_available >= __ISA_AVAILABLE_AVX) { + if (__isa_available >= __ISA_AVAILABLE_AVX) { return "/arch:AVX"; } - return ""; + return ""; } int main() { - printf("%s\n", get_arch_flags()); - return 0; + printf("%s\n", get_arch_flags()); + return 0; } diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl index b95abc7f362..e184c26aec8 100644 --- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl +++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl @@ -179,7 +179,8 @@ void voronoi_distance_to_edge_1d(float w, float randomness, output float outDist float leftPointPosition = -1.0 + hash_float_to_float(cellPosition - 1.0) * randomness; float rightPointPosition = 1.0 + hash_float_to_float(cellPosition + 1.0) * randomness; float distanceToMidLeft = distance((midPointPosition + leftPointPosition) / 2.0, localPosition); - float distanceToMidRight = distance((midPointPosition + rightPointPosition) / 2.0, localPosition); + float distanceToMidRight = distance((midPointPosition + rightPointPosition) / 2.0, + localPosition); outDistance = min(distanceToMidLeft, distanceToMidRight); } diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 993b467b396..897b0984a7e 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -104,7 +104,7 @@ class Shader : public Node { * However, graph optimization might remove the volume subgraph, but * since the user connected something to the volume output the surface * should still be transparent. - * Therefore, has_volume_connected stores whether some volume subtree + * Therefore, has_volume_connected stores whether some volume sub-tree * was connected before optimization. */ bool has_volume_connected; |