Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton
2019-11-08 11:35:17 +11:00
parent eefd806afc
commit bda58b8a89
9 changed files with 130 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
intern/cycles/util/util_defines.h
View File

@@ -16,127 +16,127 @@
*/ */
#ifndef __UTIL_DEFINES_H__ #ifndef __UTIL_DEFINES_H__
# define __UTIL_DEFINES_H__ #define __UTIL_DEFINES_H__
/* Bitness */ /* Bitness */
# if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || \ #if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || \
defined(_M_X64) defined(_M_X64)
# define __KERNEL_64_BIT__ # define __KERNEL_64_BIT__
# endif #endif
/* Qualifiers for kernel code shared by CPU and GPU */ /* Qualifiers for kernel code shared by CPU and GPU */
# ifndef __KERNEL_GPU__ #ifndef __KERNEL_GPU__
# define ccl_device static inline # define ccl_device static inline
# define ccl_device_noinline static # define ccl_device_noinline static
# define ccl_device_noinline_cpu ccl_device_noinline # define ccl_device_noinline_cpu ccl_device_noinline
# define ccl_global # define ccl_global
# define ccl_static_constant static const # define ccl_static_constant static const
# define ccl_constant const # define ccl_constant const
# define ccl_local # define ccl_local
# define ccl_local_param # define ccl_local_param
# define ccl_private # define ccl_private
# define ccl_restrict __restrict # define ccl_restrict __restrict
# define ccl_ref & # define ccl_ref &
# define ccl_optional_struct_init # define ccl_optional_struct_init
# define __KERNEL_WITH_SSE_ALIGN__ # define __KERNEL_WITH_SSE_ALIGN__
# if defined(_WIN32) && !defined(FREE_WINDOWS) # if defined(_WIN32) && !defined(FREE_WINDOWS)
# define ccl_device_inline static __forceinline # define ccl_device_inline static __forceinline
# define ccl_device_forceinline static __forceinline # define ccl_device_forceinline static __forceinline
# define ccl_align(...) __declspec(align(__VA_ARGS__)) # define ccl_align(...) __declspec(align(__VA_ARGS__))
# ifdef __KERNEL_64_BIT__ # ifdef __KERNEL_64_BIT__
# define ccl_try_align(...) __declspec(align(__VA_ARGS__)) # define ccl_try_align(...) __declspec(align(__VA_ARGS__))
# else /* __KERNEL_64_BIT__ */ # else /* __KERNEL_64_BIT__ */
# undef __KERNEL_WITH_SSE_ALIGN__ # undef __KERNEL_WITH_SSE_ALIGN__
/* No support for function arguments (error C2719). */ /* No support for function arguments (error C2719). */
# define ccl_try_align(...) # define ccl_try_align(...)
# endif /* __KERNEL_64_BIT__ */ # endif /* __KERNEL_64_BIT__ */
# define ccl_may_alias # define ccl_may_alias
# define ccl_always_inline __forceinline # define ccl_always_inline __forceinline
# define ccl_never_inline __declspec(noinline) # define ccl_never_inline __declspec(noinline)
# define ccl_maybe_unused # define ccl_maybe_unused
# else /* _WIN32 && !FREE_WINDOWS */ # else /* _WIN32 && !FREE_WINDOWS */
# define ccl_device_inline static inline __attribute__((always_inline)) # define ccl_device_inline static inline __attribute__((always_inline))
# define ccl_device_forceinline static inline __attribute__((always_inline)) # define ccl_device_forceinline static inline __attribute__((always_inline))
# define ccl_align(...) __attribute__((aligned(__VA_ARGS__))) # define ccl_align(...) __attribute__((aligned(__VA_ARGS__)))
# ifndef FREE_WINDOWS64 # ifndef FREE_WINDOWS64
# define __forceinline inline __attribute__((always_inline)) # define __forceinline inline __attribute__((always_inline))
# endif # endif
# define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__))) # define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__)))
# define ccl_may_alias __attribute__((__may_alias__)) # define ccl_may_alias __attribute__((__may_alias__))
# define ccl_always_inline __attribute__((always_inline)) # define ccl_always_inline __attribute__((always_inline))
# define ccl_never_inline __attribute__((noinline)) # define ccl_never_inline __attribute__((noinline))
# define ccl_maybe_unused __attribute__((used)) # define ccl_maybe_unused __attribute__((used))
# endif /* _WIN32 && !FREE_WINDOWS */ # endif /* _WIN32 && !FREE_WINDOWS */
/* Use to suppress '-Wimplicit-fallthrough' (in place of 'break'). */ /* Use to suppress '-Wimplicit-fallthrough' (in place of 'break'). */
# ifndef ATTR_FALLTHROUGH # ifndef ATTR_FALLTHROUGH
# if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */ # if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */
# define ATTR_FALLTHROUGH __attribute__((fallthrough)) # define ATTR_FALLTHROUGH __attribute__((fallthrough))
# else # else
# define ATTR_FALLTHROUGH ((void)0) # define ATTR_FALLTHROUGH ((void)0)
# endif
# endif # endif
# endif /* __KERNEL_GPU__ */ # endif
#endif /* __KERNEL_GPU__ */
/* macros */ /* macros */
/* hints for branch prediction, only use in code that runs a _lot_ */ /* hints for branch prediction, only use in code that runs a _lot_ */
# if defined(__GNUC__) && defined(__KERNEL_CPU__) #if defined(__GNUC__) && defined(__KERNEL_CPU__)
# define LIKELY(x) __builtin_expect(!!(x), 1) # define LIKELY(x) __builtin_expect(!!(x), 1)
# define UNLIKELY(x) __builtin_expect(!!(x), 0) # define UNLIKELY(x) __builtin_expect(!!(x), 0)
# else #else
# define LIKELY(x) (x) # define LIKELY(x) (x)
# define UNLIKELY(x) (x) # define UNLIKELY(x) (x)
# endif #endif
# if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
# if defined(__cplusplus) # if defined(__cplusplus)
/* Some magic to be sure we don't have reference in the type. */ /* Some magic to be sure we don't have reference in the type. */
template<typename T> static inline T decltype_helper(T x) template<typename T> static inline T decltype_helper(T x)
{ {
return x; return x;
} }
# define TYPEOF(x) decltype(decltype_helper(x)) # define TYPEOF(x) decltype(decltype_helper(x))
# else # else
# define TYPEOF(x) typeof(x) # define TYPEOF(x) typeof(x)
# endif
# endif # endif
#endif
/* Causes warning: /* Causes warning:
* incompatible types when assigning to type 'Foo' from type 'Bar' * incompatible types when assigning to type 'Foo' from type 'Bar'
* ... the compiler optimizes away the temp var */ * ... the compiler optimizes away the temp var */
# ifdef __GNUC__ #ifdef __GNUC__
# define CHECK_TYPE(var, type) \ # define CHECK_TYPE(var, type) \
{ \ { \
TYPEOF(var) * __tmp; \ TYPEOF(var) * __tmp; \
__tmp = (type *)NULL; \ __tmp = (type *)NULL; \
(void)__tmp; \ (void)__tmp; \
} \ } \
(void)0 (void)0
# define CHECK_TYPE_PAIR(var_a, var_b) \ # define CHECK_TYPE_PAIR(var_a, var_b) \
{ \ { \
TYPEOF(var_a) * __tmp; \ TYPEOF(var_a) * __tmp; \
__tmp = (typeof(var_b) *)NULL; \ __tmp = (typeof(var_b) *)NULL; \
(void)__tmp; \ (void)__tmp; \
} \ } \
(void)0 (void)0
# else #else
# define CHECK_TYPE(var, type) # define CHECK_TYPE(var, type)
# define CHECK_TYPE_PAIR(var_a, var_b) # define CHECK_TYPE_PAIR(var_a, var_b)
# endif #endif
/* can be used in simple macros */ /* can be used in simple macros */
# define CHECK_TYPE_INLINE(val, type) ((void)(((type)0) != (val))) #define CHECK_TYPE_INLINE(val, type) ((void)(((type)0) != (val)))
# ifndef __KERNEL_GPU__ #ifndef __KERNEL_GPU__
# include <cassert> # include <cassert>
# define util_assert(statement) assert(statement) # define util_assert(statement) assert(statement)
# else #else
# define util_assert(statement) # define util_assert(statement)
# endif #endif
#endif /* __UTIL_DEFINES_H__ */ #endif /* __UTIL_DEFINES_H__ */

16
intern/cycles/util/util_static_assert.h
View File

@@ -15,18 +15,18 @@
*/ */
#ifndef __UTIL_STATIC_ASSERT_H__ #ifndef __UTIL_STATIC_ASSERT_H__
# define __UTIL_STATIC_ASSERT_H__ #define __UTIL_STATIC_ASSERT_H__
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
/* TODO(sergey): In theory CUDA might work with own static assert /* TODO(sergey): In theory CUDA might work with own static assert
* implementation since it's just pure C++. * implementation since it's just pure C++.
*/ */
# ifdef __KERNEL_GPU__ #ifdef __KERNEL_GPU__
# ifndef static_assert # ifndef static_assert
# define static_assert(statement, message) # define static_assert(statement, message)
# endif # endif
# endif /* __KERNEL_GPU__ */ #endif /* __KERNEL_GPU__ */
/* TODO(sergey): For until C++11 is a bare minimum for us, /* TODO(sergey): For until C++11 is a bare minimum for us,
* we do a bit of a trickery to show meaningful message so * we do a bit of a trickery to show meaningful message so
@@ -42,8 +42,8 @@ CCL_NAMESPACE_BEGIN
* After C++11 bump it should be possible to glue structure * After C++11 bump it should be possible to glue structure
* name to the error message, * name to the error message,
*/ */
# define static_assert_align(st, align) \ #define static_assert_align(st, align) \
static_assert((sizeof(st) % (align) == 0), "Structure must be strictly aligned") // NOLINT static_assert((sizeof(st) % (align) == 0), "Structure must be strictly aligned") // NOLINT
CCL_NAMESPACE_END CCL_NAMESPACE_END

4
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -1978,7 +1978,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh,
if (mode & PBVH_Collapse) { if (mode & PBVH_Collapse) {
EdgeQueue q; EdgeQueue q;
BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert * [2]), 0, 128, BLI_MEMPOOL_NOP); BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), 0, 128, BLI_MEMPOOL_NOP);
EdgeQueueContext eq_ctx = { EdgeQueueContext eq_ctx = {
&q, &q,
queue_pool, queue_pool,
@@ -1997,7 +1997,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh,
if (mode & PBVH_Subdivide) { if (mode & PBVH_Subdivide) {
EdgeQueue q; EdgeQueue q;
BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert * [2]), 0, 128, BLI_MEMPOOL_NOP); BLI_mempool *queue_pool = BLI_mempool_create(sizeof(BMVert *[2]), 0, 128, BLI_MEMPOOL_NOP);
EdgeQueueContext eq_ctx = { EdgeQueueContext eq_ctx = {
&q, &q,
queue_pool, queue_pool,

34
source/blender/blenlib/BLI_compiler_compat.h
View File

@@ -15,7 +15,7 @@
*/ */
#ifndef __BLI_COMPILER_COMPAT_H__ #ifndef __BLI_COMPILER_COMPAT_H__
# define __BLI_COMPILER_COMPAT_H__ #define __BLI_COMPILER_COMPAT_H__
/** \file /** \file
* \ingroup bli * \ingroup bli
@@ -23,32 +23,32 @@
* Use to help with cross platform portability. * Use to help with cross platform portability.
*/ */
# if defined(_MSC_VER) #if defined(_MSC_VER)
# define alloca _alloca # define alloca _alloca
# endif #endif
# if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus) #if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus)
extern "C++" { extern "C++" {
/* Some magic to be sure we don't have reference in the type. */ /* Some magic to be sure we don't have reference in the type. */
template<typename T> static inline T decltype_helper(T x) template<typename T> static inline T decltype_helper(T x)
{ {
return x; return x;
} }
# define typeof(x) decltype(decltype_helper(x)) # define typeof(x) decltype(decltype_helper(x))
} }
# endif #endif
/* little macro so inline keyword works */ /* little macro so inline keyword works */
# if defined(_MSC_VER) #if defined(_MSC_VER)
# define BLI_INLINE static __forceinline # define BLI_INLINE static __forceinline
# else #else
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__)) # define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
# endif #endif
# if defined(__GNUC__) #if defined(__GNUC__)
# define BLI_NOINLINE __attribute__((noinline)) # define BLI_NOINLINE __attribute__((noinline))
# else #else
# define BLI_NOINLINE # define BLI_NOINLINE
# endif #endif
#endif /* __BLI_COMPILER_COMPAT_H__ */ #endif /* __BLI_COMPILER_COMPAT_H__ */

3
source/blender/draw/engines/workbench/workbench_private.h
View File

@@ -407,7 +407,8 @@ BLI_INLINE eGPUTextureFormat workbench_color_texture_format(const WORKBENCH_Priv
return result; return result;
} }
BLI_INLINE bool workbench_background_dither_factor(const WORKBENCH_PrivateData *wpd) { BLI_INLINE bool workbench_background_dither_factor(const WORKBENCH_PrivateData *wpd)
{
/* Only apply dithering when rendering on a RGBA8 texture. /* Only apply dithering when rendering on a RGBA8 texture.
* The dithering will remove banding when using a gradient as background */ * The dithering will remove banding when using a gradient as background */
return workbench_color_texture_format(wpd) == GPU_RGBA8; return workbench_color_texture_format(wpd) == GPU_RGBA8;

2
source/blender/editors/screen/area.c
View File

@@ -2869,7 +2869,7 @@ void ED_region_info_draw(ARegion *ar,
float fill_color[4], float fill_color[4],
const bool full_redraw) const bool full_redraw)
{ {
ED_region_info_draw_multiline(ar, (const char * [2]){text, NULL}, fill_color, full_redraw); ED_region_info_draw_multiline(ar, (const char *[2]){text, NULL}, fill_color, full_redraw);
} }
#define MAX_METADATA_STR 1024 #define MAX_METADATA_STR 1024

3
source/blender/nodes/shader/nodes/node_shader_math.c
View File

@@ -74,7 +74,8 @@ static int gpu_shader_math(GPUMaterial *mat,
if (ret && node->custom2 & SHD_MATH_CLAMP) { if (ret && node->custom2 & SHD_MATH_CLAMP) {
float min[3] = {0.0f, 0.0f, 0.0f}; float min[3] = {0.0f, 0.0f, 0.0f};
float max[3] = {1.0f, 1.0f, 1.0f}; float max[3] = {1.0f, 1.0f, 1.0f};
GPU_link(mat, "clamp_value", out[0].link, GPU_constant(min), GPU_constant(max), &out[0].link); GPU_link(
mat, "clamp_value", out[0].link, GPU_constant(min), GPU_constant(max), &out[0].link);
} }
return ret; return ret;
} }

3
source/blender/nodes/shader/nodes/node_shader_mixRgb.c
View File

@@ -93,7 +93,8 @@ static int gpu_shader_mix_rgb(GPUMaterial *mat,
if (ret && node->custom2 & SHD_MIXRGB_CLAMP) { if (ret && node->custom2 & SHD_MIXRGB_CLAMP) {
float min[3] = {0.0f, 0.0f, 0.0f}; float min[3] = {0.0f, 0.0f, 0.0f};
float max[3] = {1.0f, 1.0f, 1.0f}; float max[3] = {1.0f, 1.0f, 1.0f};
GPU_link(mat, "clamp_color", out[0].link, GPU_constant(min), GPU_constant(max), &out[0].link); GPU_link(
mat, "clamp_color", out[0].link, GPU_constant(min), GPU_constant(max), &out[0].link);
} }
return ret; return ret;
} }

5
tests/gtests/blenlib/BLI_kdopbvh_test.cc
View File

@@ -50,7 +50,10 @@ TEST(kdopbvh, Single)
BLI_bvhtree_free(tree); BLI_bvhtree_free(tree);
} }
static void optimal_check_callback(void *userdata, int index, const float co[3], BVHTreeNearest *nearest) static void optimal_check_callback(void *userdata,
int index,
const float co[3],
BVHTreeNearest *nearest)
{ {
float(*points)[3] = (float(*)[3])userdata; float(*points)[3] = (float(*)[3])userdata;