diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-15 02:42:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-15 02:50:34 +0300 |
| commit | 61e1e9adb8a2370321a13773d2bb4b762abfb036 (patch) | |
| tree | 59feaac4154af9c0a14bb72f79e398f34e3aa36e /intern/cycles/util/util_types.h | |
| parent | fa6c45b092a2ee88e42fa039ac78fc02a97d9a97 (diff) | |
Cycles: Revert changes to inline flags enabled for release only
It appears it's not really needed for convenient debugging when
using proper flags passed to the compiler. Basically, it is -g3
and set breakpoint to a function as if it's not in the namespace.
Not as if a code was any wrong, just it's possible to have more
clear solution for the issue i've tried to solve in the past.
Diffstat (limited to 'intern/cycles/util/util_types.h')
| -rw-r--r-- | intern/cycles/util/util_types.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 2a199e591bf..ce84200d0b6 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -33,11 +33,7 @@ #ifndef __KERNEL_GPU__ -# ifdef NDEBUG -# define ccl_device static inline -# else -# define ccl_device static -# endif +#define ccl_device static inline #define ccl_device_noinline static #define ccl_global #define ccl_constant @@ -53,11 +49,7 @@ #define ccl_try_align(...) /* not support for function arguments (error C2719) */ #endif #define ccl_may_alias -# ifdef NDEBUG -# define ccl_always_inline __forceinline -# else -# define ccl_always_inline -# endif +#define ccl_always_inline __forceinline #define ccl_maybe_unused #else |