diff options
Diffstat (limited to 'intern/cycles/kernel/kernels/optix/kernel_optix.cu')
| -rw-r--r-- | intern/cycles/kernel/kernels/optix/kernel_optix.cu | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernels/optix/kernel_optix.cu b/intern/cycles/kernel/kernels/optix/kernel_optix.cu index 0c2c84fdbdf..7f609eab474 100644 --- a/intern/cycles/kernel/kernels/optix/kernel_optix.cu +++ b/intern/cycles/kernel/kernels/optix/kernel_optix.cu @@ -45,13 +45,12 @@ template<bool always = false> ccl_device_forceinline uint get_object_id() uint object = optixGetInstanceId(); #endif // Choose between always returning object ID or only for instances - if (always) - // Can just remove the high bit since instance always contains object ID - return object & 0x7FFFFFF; // OPTIX_ABI_VERSION >= 23 ? 0x7FFFFFF : 0x7FFFFF - // Set to OBJECT_NONE if this is not an instanced object - else if (object & 0x8000000) // OPTIX_ABI_VERSION >= 23 ? 0x8000000 : 0x800000 - object = OBJECT_NONE; - return object; + if (always || (object & 1) == 0) + // Can just remove the low bit since instance always contains object ID + return object >> 1; + else + // Set to OBJECT_NONE if this is not an instanced object + return OBJECT_NONE; } extern "C" __global__ void __raygen__kernel_optix_path_trace() |