diff options
| author | jon denning <gfxcoder@gmail.com> | 2022-07-29 20:51:49 +0300 |
|---|---|---|
| committer | jon denning <gfxcoder@gmail.com> | 2022-07-29 20:51:49 +0300 |
| commit | 6485941d7a8158381288ce044b657e2c147ff73a (patch) | |
| tree | 8fc98916154dfc7d7f57a95732fddb620272d9ac /intern/cycles/util/types_uint2_impl.h | |
| parent | eee25a175ad3c0736878918bacd4995e67195ec0 (diff) | |
| parent | 9b9417b66150fd070619006dbd233369709edf1b (diff) | |
Merge branch 'master' into retopo_transformretopo_transform
Diffstat (limited to 'intern/cycles/util/types_uint2_impl.h')
| -rw-r--r-- | intern/cycles/util/types_uint2_impl.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/intern/cycles/util/types_uint2_impl.h b/intern/cycles/util/types_uint2_impl.h index cac0ba6b531..b508aaf2543 100644 --- a/intern/cycles/util/types_uint2_impl.h +++ b/intern/cycles/util/types_uint2_impl.h @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2022 Blender Foundation */ -#ifndef __UTIL_TYPES_UINT2_IMPL_H__ -#define __UTIL_TYPES_UINT2_IMPL_H__ +#pragma once #ifndef __UTIL_TYPES_H__ # error "Do not include this file directly, include util/types.h instead." @@ -10,7 +9,8 @@ CCL_NAMESPACE_BEGIN -#if !defined(__KERNEL_GPU__) || defined(__KERNEL_ONEAPI__) +#ifndef __KERNEL_NATIVE_VECTOR_TYPES__ +# ifndef __KERNEL_GPU__ __forceinline uint uint2::operator[](uint i) const { util_assert(i < 2); @@ -22,14 +22,13 @@ __forceinline uint &uint2::operator[](uint i) util_assert(i < 2); return *(&x + i); } +# endif ccl_device_inline uint2 make_uint2(uint x, uint y) { uint2 a = {x, y}; return a; } -#endif /* !defined(__KERNEL_GPU__) || defined(__KERNEL_ONEAPI__) */ +#endif /* __KERNEL_NATIVE_VECTOR_TYPES__ */ CCL_NAMESPACE_END - -#endif /* __UTIL_TYPES_UINT2_IMPL_H__ */ |