diff options
| author | Andrii Symkin <pembem22> | 2022-07-29 14:41:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-09 17:49:34 +0300 |
| commit | d832d993c5b47b0de7ca24914ad9c064607830c7 (patch) | |
| tree | 889b7cd9f135a40cbaccdb4537c8de1faa1c562f /intern/cycles/util/defines.h | |
| parent | 7921faa6519b9eb9062269b5d9c003c64ead2b8b (diff) | |
Cycles: add new Spectrum and PackedSpectrum types
These replace float3 and packed_float3 in various places in the kernel where a
spectral color representation will be used in the future. That representation
will require more than 3 channels and conversion to from/RGB. The kernel code
was refactored to remove the assumption that Spectrum and RGB colors are the
same thing.
There are no functional changes, Spectrum is still a float3 and the conversion
functions are no-ops.
Differential Revision: https://developer.blender.org/D15535
Diffstat (limited to 'intern/cycles/util/defines.h')
| -rw-r--r-- | intern/cycles/util/defines.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/util/defines.h b/intern/cycles/util/defines.h index d0df1a221fc..c7118ca09c9 100644 --- a/intern/cycles/util/defines.h +++ b/intern/cycles/util/defines.h @@ -136,4 +136,7 @@ template<typename T> static inline T decltype_helper(T x) # define util_assert(statement) #endif +#define CONCAT_HELPER(a, ...) a##__VA_ARGS__ +#define CONCAT(a, ...) CONCAT_HELPER(a, __VA_ARGS__) + #endif /* __UTIL_DEFINES_H__ */ |