diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-07-28 20:57:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-07-28 22:27:13 +0300 |
| commit | 79ab76e156d4bde937335be784cdf220294600d5 (patch) | |
| tree | 1a126a9f4c58934e92a6caca2a482f7fd6e444ce /intern/cycles/util/types_int4_impl.h | |
| parent | d094a3722c9c00a3d32a66f1f0fffa12619630a8 (diff) | |
Cleanup: simplifications and consistency for vector types
* OneAPI: remove separate float3 definition
* OneAPI: disable operator[] to match other GPUs
* OneAPI: make int3 compact to match other GPUs
* Use #pragma once
* Add __KERNEL_NATIVE_VECTOR_TYPES__ to simplify checks
* Remove unused vector3
Diffstat (limited to 'intern/cycles/util/types_int4_impl.h')
| -rw-r--r-- | intern/cycles/util/types_int4_impl.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/intern/cycles/util/types_int4_impl.h b/intern/cycles/util/types_int4_impl.h index 11e1ede6705..2aab29df941 100644 --- a/intern/cycles/util/types_int4_impl.h +++ b/intern/cycles/util/types_int4_impl.h @@ -1,20 +1,15 @@ /* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2022 Blender Foundation */ -#ifndef __UTIL_TYPES_INT4_IMPL_H__ -#define __UTIL_TYPES_INT4_IMPL_H__ +#pragma once #ifndef __UTIL_TYPES_H__ # error "Do not include this file directly, include util/types.h instead." #endif -#ifndef __KERNEL_GPU__ -# include <cstdio> -#endif - CCL_NAMESPACE_BEGIN -#if !defined(__KERNEL_GPU__) || defined(__KERNEL_ONEAPI__) +#ifndef __KERNEL_NATIVE_VECTOR_TYPES__ # ifdef __KERNEL_SSE__ __forceinline int4::int4() { @@ -45,6 +40,7 @@ __forceinline int4 &int4::operator=(const int4 &a) } # endif /* __KERNEL_SSE__ */ +# ifndef __KERNEL_GPU__ __forceinline int int4::operator[](int i) const { util_assert(i >= 0); @@ -58,6 +54,7 @@ __forceinline int &int4::operator[](int i) util_assert(i < 4); return *(&x + i); } +# endif ccl_device_inline int4 make_int4(int i) { @@ -105,8 +102,6 @@ ccl_device_inline void print_int4(const char *label, const int4 &a) { printf("%s: %d %d %d %d\n", label, a.x, a.y, a.z, a.w); } -#endif /* !defined(__KERNEL_GPU__) || defined(__KERNEL_ONEAPI__) */ +#endif /* __KERNEL_NATIVE_VECTOR_TYPES__ */ CCL_NAMESPACE_END - -#endif /* __UTIL_TYPES_INT4_IMPL_H__ */ |