From eb71157e2a9c7abdeb7045bdf9b79d8ca27ba263 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Thu, 14 Oct 2021 17:51:27 +0200
Subject: Cleanup: add utility functions for packing integers

---
 intern/cycles/kernel/device/optix/kernel.cu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intern/cycles/kernel/device')

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()
-- 
cgit v1.2.3