diff options
Diffstat (limited to 'intern/cycles/util/types_float8.h')
| -rw-r--r-- | intern/cycles/util/types_float8.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/intern/cycles/util/types_float8.h b/intern/cycles/util/types_float8.h index d71149946f7..29fd632f08e 100644 --- a/intern/cycles/util/types_float8.h +++ b/intern/cycles/util/types_float8.h @@ -2,8 +2,7 @@ * Original code Copyright 2017, Intel Corporation * Modifications Copyright 2018-2022 Blender Foundation. */ -#ifndef __UTIL_TYPES_FLOAT8_H__ -#define __UTIL_TYPES_FLOAT8_H__ +#pragma once #ifndef __UTIL_TYPES_H__ # error "Do not include this file directly, include util/types.h instead." @@ -11,11 +10,16 @@ CCL_NAMESPACE_BEGIN -#if !defined(__KERNEL_GPU__) || defined(__KERNEL_ONEAPI__) +/* float8 is a reserved type in Metal that has not been implemented. For + * that reason this is named float8_t and not using native vector types. */ -struct ccl_try_align(32) float8 +#ifdef __KERNEL_GPU__ +struct float8_t +#else +struct ccl_try_align(32) float8_t +#endif { -# ifdef __KERNEL_AVX2__ +#ifdef __KERNEL_AVX2__ union { __m256 m256; struct { @@ -23,28 +27,27 @@ struct ccl_try_align(32) float8 }; }; - __forceinline float8(); - __forceinline float8(const float8 &a); - __forceinline explicit float8(const __m256 &a); + __forceinline float8_t(); + __forceinline float8_t(const float8_t &a); + __forceinline explicit float8_t(const __m256 &a); __forceinline operator const __m256 &() const; __forceinline operator __m256 &(); - __forceinline float8 &operator=(const float8 &a); + __forceinline float8_t &operator=(const float8_t &a); -# else /* __KERNEL_AVX2__ */ +#else /* __KERNEL_AVX2__ */ float a, b, c, d, e, f, g, h; -# endif /* __KERNEL_AVX2__ */ +#endif /* __KERNEL_AVX2__ */ +#ifndef __KERNEL_GPU__ __forceinline float operator[](int i) const; __forceinline float &operator[](int i); +#endif }; -ccl_device_inline float8 make_float8(float f); -ccl_device_inline float8 -make_float8(float a, float b, float c, float d, float e, float f, float g, float h); -#endif /* !defined(__KERNEL_GPU__) || defined(__KERNEL_ONEAPI__) */ +ccl_device_inline float8_t make_float8_t(float f); +ccl_device_inline float8_t +make_float8_t(float a, float b, float c, float d, float e, float f, float g, float h); CCL_NAMESPACE_END - -#endif /* __UTIL_TYPES_FLOAT8_H__ */ |