diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-14 18:51:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-15 16:42:44 +0300 |
| commit | eb71157e2a9c7abdeb7045bdf9b79d8ca27ba263 (patch) | |
| tree | 16debc9c1a427e28d909890c917e55e9dfd16c5e /intern/cycles/kernel/device | |
| parent | 2ba7c3aa650c3c795d903a24998204f67c75b017 (diff) | |
Cleanup: add utility functions for packing integers
Diffstat (limited to 'intern/cycles/kernel/device')
| -rw-r--r-- | intern/cycles/kernel/device/optix/kernel.cu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/device/optix/kernel.cu b/intern/cycles/kernel/device/optix/kernel.cu index 736f30d93ef..c9577bb2aa2 100644 --- a/intern/cycles/kernel/device/optix/kernel.cu +++ b/intern/cycles/kernel/device/optix/kernel.cu @@ -34,11 +34,11 @@ template<typename T> ccl_device_forceinline T *get_payload_ptr_0() { - return (T *)(((uint64_t)optixGetPayload_1() << 32) | optixGetPayload_0()); + return pointer_unpack_from_uint<T>(optixGetPayload_0(), optixGetPayload_1()); } template<typename T> ccl_device_forceinline T *get_payload_ptr_2() { - return (T *)(((uint64_t)optixGetPayload_3() << 32) | optixGetPayload_2()); + return pointer_unpack_from_uint<T>(optixGetPayload_2(), optixGetPayload_3()); } ccl_device_forceinline int get_object_id() |