diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-07-29 15:40:50 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-09 17:07:23 +0300 |
commit | 1988665c3c310cbfb66b4e499408fa48c522545c (patch) | |
tree | 5e5771dd13165d9d7ab67fe8837ac088de522eec /intern/cycles/util/types_int3.h | |
parent | 9990792e87238386375c97f431f648c1334bd587 (diff) |
Cleanup: make vector types make/print functions consistent between CPU and GPU
Now all the same ones are available on CPU and GPU, which was previously not
possible due to lack of operator overloadng in OpenCL. Print functions are
no-ops on some GPUs.
Ref D15535
Diffstat (limited to 'intern/cycles/util/types_int3.h')
-rw-r--r-- | intern/cycles/util/types_int3.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/util/types_int3.h b/intern/cycles/util/types_int3.h index 3196b158ee9..e059ddd3660 100644 --- a/intern/cycles/util/types_int3.h +++ b/intern/cycles/util/types_int3.h @@ -44,9 +44,10 @@ struct ccl_try_align(16) int3 # endif }; -ccl_device_inline int3 make_int3(int i); ccl_device_inline int3 make_int3(int x, int y, int z); -ccl_device_inline void print_int3(const char *label, const int3 &a); #endif /* __KERNEL_NATIVE_VECTOR_TYPES__ */ +ccl_device_inline int3 make_int3(int i); +ccl_device_inline void print_int3(ccl_private const char *label, const int3 a); + CCL_NAMESPACE_END |