forked from bartvdbraak/blender
Cleanup: clang-format
This commit is contained in:
parent
eefd806afc
commit
bda58b8a89
@ -16,127 +16,127 @@
|
||||
*/
|
||||
|
||||
#ifndef __UTIL_DEFINES_H__
|
||||
# define __UTIL_DEFINES_H__
|
||||
#define __UTIL_DEFINES_H__
|
||||
|
||||
/* Bitness */
|
||||
|
||||
# if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || \
|
||||
defined(_M_X64)
|
||||
# define __KERNEL_64_BIT__
|
||||
# endif
|
||||
#if defined(__ppc64__) || defined(__PPC64__) || defined(__x86_64__) || defined(__ia64__) || \
|
||||
defined(_M_X64)
|
||||
# define __KERNEL_64_BIT__
|
||||
#endif
|
||||
|
||||
/* Qualifiers for kernel code shared by CPU and GPU */
|
||||
|
||||
# ifndef __KERNEL_GPU__
|
||||
# define ccl_device static inline
|
||||
# define ccl_device_noinline static
|
||||
# define ccl_device_noinline_cpu ccl_device_noinline
|
||||
# define ccl_global
|
||||
# define ccl_static_constant static const
|
||||
# define ccl_constant const
|
||||
# define ccl_local
|
||||
# define ccl_local_param
|
||||
# define ccl_private
|
||||
# define ccl_restrict __restrict
|
||||
# define ccl_ref &
|
||||
# define ccl_optional_struct_init
|
||||
# define __KERNEL_WITH_SSE_ALIGN__
|
||||
#ifndef __KERNEL_GPU__
|
||||
# define ccl_device static inline
|
||||
# define ccl_device_noinline static
|
||||
# define ccl_device_noinline_cpu ccl_device_noinline
|
||||
# define ccl_global
|
||||
# define ccl_static_constant static const
|
||||
# define ccl_constant const
|
||||
# define ccl_local
|
||||
# define ccl_local_param
|
||||
# define ccl_private
|
||||
# define ccl_restrict __restrict
|
||||
# define ccl_ref &
|
||||
# define ccl_optional_struct_init
|
||||
# define __KERNEL_WITH_SSE_ALIGN__
|
||||
|
||||
# if defined(_WIN32) && !defined(FREE_WINDOWS)
|
||||
# define ccl_device_inline static __forceinline
|
||||
# define ccl_device_forceinline static __forceinline
|
||||
# define ccl_align(...) __declspec(align(__VA_ARGS__))
|
||||
# ifdef __KERNEL_64_BIT__
|
||||
# define ccl_try_align(...) __declspec(align(__VA_ARGS__))
|
||||
# else /* __KERNEL_64_BIT__ */
|
||||
# undef __KERNEL_WITH_SSE_ALIGN__
|
||||
# if defined(_WIN32) && !defined(FREE_WINDOWS)
|
||||
# define ccl_device_inline static __forceinline
|
||||
# define ccl_device_forceinline static __forceinline
|
||||
# define ccl_align(...) __declspec(align(__VA_ARGS__))
|
||||
# ifdef __KERNEL_64_BIT__
|
||||
# define ccl_try_align(...) __declspec(align(__VA_ARGS__))
|
||||
# else /* __KERNEL_64_BIT__ */
|
||||
# undef __KERNEL_WITH_SSE_ALIGN__
|
||||
/* No support for function arguments (error C2719). */
|
||||
# define ccl_try_align(...)
|
||||
# endif /* __KERNEL_64_BIT__ */
|
||||
# define ccl_may_alias
|
||||
# define ccl_always_inline __forceinline
|
||||
# define ccl_never_inline __declspec(noinline)
|
||||
# define ccl_maybe_unused
|
||||
# else /* _WIN32 && !FREE_WINDOWS */
|
||||
# define ccl_device_inline static inline __attribute__((always_inline))
|
||||
# define ccl_device_forceinline static inline __attribute__((always_inline))
|
||||
# define ccl_align(...) __attribute__((aligned(__VA_ARGS__)))
|
||||
# ifndef FREE_WINDOWS64
|
||||
# define __forceinline inline __attribute__((always_inline))
|
||||
# endif
|
||||
# define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__)))
|
||||
# define ccl_may_alias __attribute__((__may_alias__))
|
||||
# define ccl_always_inline __attribute__((always_inline))
|
||||
# define ccl_never_inline __attribute__((noinline))
|
||||
# define ccl_maybe_unused __attribute__((used))
|
||||
# endif /* _WIN32 && !FREE_WINDOWS */
|
||||
# define ccl_try_align(...)
|
||||
# endif /* __KERNEL_64_BIT__ */
|
||||
# define ccl_may_alias
|
||||
# define ccl_always_inline __forceinline
|
||||
# define ccl_never_inline __declspec(noinline)
|
||||
# define ccl_maybe_unused
|
||||
# else /* _WIN32 && !FREE_WINDOWS */
|
||||
# define ccl_device_inline static inline __attribute__((always_inline))
|
||||
# define ccl_device_forceinline static inline __attribute__((always_inline))
|
||||
# define ccl_align(...) __attribute__((aligned(__VA_ARGS__)))
|
||||
# ifndef FREE_WINDOWS64
|
||||
# define __forceinline inline __attribute__((always_inline))
|
||||
# endif
|
||||
# define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__)))
|
||||
# define ccl_may_alias __attribute__((__may_alias__))
|
||||
# define ccl_always_inline __attribute__((always_inline))
|
||||
# define ccl_never_inline __attribute__((noinline))
|
||||
# define ccl_maybe_unused __attribute__((used))
|
||||
# endif /* _WIN32 && !FREE_WINDOWS */
|
||||
|
||||
/* Use to suppress '-Wimplicit-fallthrough' (in place of 'break'). */
|
||||
# ifndef ATTR_FALLTHROUGH
|
||||
# if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */
|
||||
# define ATTR_FALLTHROUGH __attribute__((fallthrough))
|
||||
# else
|
||||
# define ATTR_FALLTHROUGH ((void)0)
|
||||
# endif
|
||||
# ifndef ATTR_FALLTHROUGH
|
||||
# if defined(__GNUC__) && (__GNUC__ >= 7) /* gcc7.0+ only */
|
||||
# define ATTR_FALLTHROUGH __attribute__((fallthrough))
|
||||
# else
|
||||
# define ATTR_FALLTHROUGH ((void)0)
|
||||
# endif
|
||||
# endif /* __KERNEL_GPU__ */
|
||||
# endif
|
||||
#endif /* __KERNEL_GPU__ */
|
||||
|
||||
/* macros */
|
||||
|
||||
/* hints for branch prediction, only use in code that runs a _lot_ */
|
||||
# if defined(__GNUC__) && defined(__KERNEL_CPU__)
|
||||
# define LIKELY(x) __builtin_expect(!!(x), 1)
|
||||
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
|
||||
# else
|
||||
# define LIKELY(x) (x)
|
||||
# define UNLIKELY(x) (x)
|
||||
# endif
|
||||
#if defined(__GNUC__) && defined(__KERNEL_CPU__)
|
||||
# define LIKELY(x) __builtin_expect(!!(x), 1)
|
||||
# define UNLIKELY(x) __builtin_expect(!!(x), 0)
|
||||
#else
|
||||
# define LIKELY(x) (x)
|
||||
# define UNLIKELY(x) (x)
|
||||
#endif
|
||||
|
||||
# if defined(__GNUC__) || defined(__clang__)
|
||||
# if defined(__cplusplus)
|
||||
#if defined(__GNUC__) || defined(__clang__)
|
||||
# if defined(__cplusplus)
|
||||
/* Some magic to be sure we don't have reference in the type. */
|
||||
template<typename T> static inline T decltype_helper(T x)
|
||||
{
|
||||
return x;
|
||||
}
|
||||
# define TYPEOF(x) decltype(decltype_helper(x))
|
||||
# else
|
||||
# define TYPEOF(x) typeof(x)
|
||||
# endif
|
||||
# define TYPEOF(x) decltype(decltype_helper(x))
|
||||
# else
|
||||
# define TYPEOF(x) typeof(x)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Causes warning:
|
||||
* incompatible types when assigning to type 'Foo' from type 'Bar'
|
||||
* ... the compiler optimizes away the temp var */
|
||||
# ifdef __GNUC__
|
||||
# define CHECK_TYPE(var, type) \
|
||||
{ \
|
||||
TYPEOF(var) * __tmp; \
|
||||
__tmp = (type *)NULL; \
|
||||
(void)__tmp; \
|
||||
} \
|
||||
(void)0
|
||||
#ifdef __GNUC__
|
||||
# define CHECK_TYPE(var, type) \
|
||||
{ \
|
||||
TYPEOF(var) * __tmp; \
|
||||
__tmp = (type *)NULL; \
|
||||
(void)__tmp; \
|
||||
} \
|
||||
(void)0
|
||||
|
||||
# define CHECK_TYPE_PAIR(var_a, var_b) \
|
||||
{ \
|
||||
TYPEOF(var_a) * __tmp; \
|
||||
__tmp = (typeof(var_b) *)NULL; \
|
||||
(void)__tmp; \
|
||||
} \
|
||||
(void)0
|
||||
# else
|
||||
# define CHECK_TYPE(var, type)
|
||||
# define CHECK_TYPE_PAIR(var_a, var_b)
|
||||
# endif
|
||||
# define CHECK_TYPE_PAIR(var_a, var_b) \
|
||||
{ \
|
||||
TYPEOF(var_a) * __tmp; \
|
||||
__tmp = (typeof(var_b) *)NULL; \
|
||||
(void)__tmp; \
|
||||
} \
|
||||
(void)0
|
||||
#else
|
||||
# define CHECK_TYPE(var, type)
|
||||
# define CHECK_TYPE_PAIR(var_a, var_b)
|
||||
#endif
|
||||
|
||||
/* 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__
|
||||
# include <cassert>
|
||||
# define util_assert(statement) assert(statement)
|
||||
# else
|
||||
# define util_assert(statement)
|
||||
# endif
|
||||
#ifndef __KERNEL_GPU__
|
||||
# include <cassert>
|
||||
# define util_assert(statement) assert(statement)
|
||||
#else
|
||||
# define util_assert(statement)
|
||||
#endif
|
||||
|
||||
#endif /* __UTIL_DEFINES_H__ */
|
||||
|
@ -15,18 +15,18 @@
|
||||
*/
|
||||
|
||||
#ifndef __UTIL_STATIC_ASSERT_H__
|
||||
# define __UTIL_STATIC_ASSERT_H__
|
||||
#define __UTIL_STATIC_ASSERT_H__
|
||||
|
||||
CCL_NAMESPACE_BEGIN
|
||||
|
||||
/* TODO(sergey): In theory CUDA might work with own static assert
|
||||
* implementation since it's just pure C++.
|
||||
*/
|
||||
# ifdef __KERNEL_GPU__
|
||||
# ifndef static_assert
|
||||
# define static_assert(statement, message)
|
||||
# endif
|
||||
# endif /* __KERNEL_GPU__ */
|
||||
#ifdef __KERNEL_GPU__
|
||||
# ifndef static_assert
|
||||
# define static_assert(statement, message)
|
||||
# endif
|
||||
#endif /* __KERNEL_GPU__ */
|
||||
|
||||
/* TODO(sergey): For until C++11 is a bare minimum for us,
|
||||
* 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
|
||||
* name to the error message,
|
||||
*/
|
||||
# define static_assert_align(st, align) \
|
||||
static_assert((sizeof(st) % (align) == 0), "Structure must be strictly aligned") // NOLINT
|
||||
#define static_assert_align(st, align) \
|
||||
static_assert((sizeof(st) % (align) == 0), "Structure must be strictly aligned") // NOLINT
|
||||
|
||||
CCL_NAMESPACE_END
|
||||
|
||||
|
@ -1978,7 +1978,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh,
|
||||
|
||||
if (mode & PBVH_Collapse) {
|
||||
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 = {
|
||||
&q,
|
||||
queue_pool,
|
||||
@ -1997,7 +1997,7 @@ bool BKE_pbvh_bmesh_update_topology(PBVH *bvh,
|
||||
|
||||
if (mode & PBVH_Subdivide) {
|
||||
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 = {
|
||||
&q,
|
||||
queue_pool,
|
||||
|
@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
#ifndef __BLI_COMPILER_COMPAT_H__
|
||||
# define __BLI_COMPILER_COMPAT_H__
|
||||
#define __BLI_COMPILER_COMPAT_H__
|
||||
|
||||
/** \file
|
||||
* \ingroup bli
|
||||
@ -23,32 +23,32 @@
|
||||
* Use to help with cross platform portability.
|
||||
*/
|
||||
|
||||
# if defined(_MSC_VER)
|
||||
# define alloca _alloca
|
||||
# endif
|
||||
#if defined(_MSC_VER)
|
||||
# define alloca _alloca
|
||||
#endif
|
||||
|
||||
# if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus)
|
||||
#if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus)
|
||||
extern "C++" {
|
||||
/* Some magic to be sure we don't have reference in the type. */
|
||||
template<typename T> static inline T decltype_helper(T 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 */
|
||||
# if defined(_MSC_VER)
|
||||
# define BLI_INLINE static __forceinline
|
||||
# else
|
||||
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
|
||||
# endif
|
||||
#if defined(_MSC_VER)
|
||||
# define BLI_INLINE static __forceinline
|
||||
#else
|
||||
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
|
||||
#endif
|
||||
|
||||
# if defined(__GNUC__)
|
||||
# define BLI_NOINLINE __attribute__((noinline))
|
||||
# else
|
||||
# define BLI_NOINLINE
|
||||
# endif
|
||||
#if defined(__GNUC__)
|
||||
# define BLI_NOINLINE __attribute__((noinline))
|
||||
#else
|
||||
# define BLI_NOINLINE
|
||||
#endif
|
||||
|
||||
#endif /* __BLI_COMPILER_COMPAT_H__ */
|
||||
|
@ -407,7 +407,8 @@ BLI_INLINE eGPUTextureFormat workbench_color_texture_format(const WORKBENCH_Priv
|
||||
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.
|
||||
* The dithering will remove banding when using a gradient as background */
|
||||
return workbench_color_texture_format(wpd) == GPU_RGBA8;
|
||||
|
@ -2869,7 +2869,7 @@ void ED_region_info_draw(ARegion *ar,
|
||||
float fill_color[4],
|
||||
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
|
||||
|
@ -74,7 +74,8 @@ static int gpu_shader_math(GPUMaterial *mat,
|
||||
if (ret && node->custom2 & SHD_MATH_CLAMP) {
|
||||
float min[3] = {0.0f, 0.0f, 0.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;
|
||||
}
|
||||
|
@ -93,7 +93,8 @@ static int gpu_shader_mix_rgb(GPUMaterial *mat,
|
||||
if (ret && node->custom2 & SHD_MIXRGB_CLAMP) {
|
||||
float min[3] = {0.0f, 0.0f, 0.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;
|
||||
}
|
||||
|
@ -50,7 +50,10 @@ TEST(kdopbvh, Single)
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user