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_float4.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_float4.h')
| -rw-r--r-- | intern/cycles/util/types_float4.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/util/types_float4.h b/intern/cycles/util/types_float4.h index 6b301c47362..a347cfce9a1 100644 --- a/intern/cycles/util/types_float4.h +++ b/intern/cycles/util/types_float4.h @@ -40,10 +40,11 @@ struct ccl_try_align(16) float4 # endif }; -ccl_device_inline float4 make_float4(float f); ccl_device_inline float4 make_float4(float x, float y, float z, float w); -ccl_device_inline float4 make_float4(const int4 &i); -ccl_device_inline void print_float4(const char *label, const float4 &a); #endif /* __KERNEL_NATIVE_VECTOR_TYPES__ */ +ccl_device_inline float4 make_float4(float f); +ccl_device_inline float4 make_float4(const int4 i); +ccl_device_inline void print_float4(ccl_private const char *label, const float4 a); + CCL_NAMESPACE_END |