diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-07-15 19:00:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-07-15 19:28:13 +0300 |
| commit | bb376da6dfdd2476fc3738ce1fc89dac27825cef (patch) | |
| tree | 0e5ced7e579d18ce0211a6e3d4df6f4a961782f0 | |
| parent | 03aeef64d5c2bd1eb1aa790bddbce728857778f3 (diff) | |
Fix Cycles MetalRT error after recent specialization changes
| -rw-r--r-- | intern/cycles/kernel/device/gpu/kernel.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/metal/function_constants.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h index b9a44ccad02..e1ab802aa80 100644 --- a/intern/cycles/kernel/device/gpu/kernel.h +++ b/intern/cycles/kernel/device/gpu/kernel.h @@ -246,7 +246,7 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) ccl_gpu_kernel_postfix #if defined(__KERNEL_METAL_APPLE__) && defined(__METALRT__) -constant int __dummy_constant [[function_constant(0)]]; +constant int __dummy_constant [[function_constant(Kernel_DummyConstant)]]; #endif ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) diff --git a/intern/cycles/kernel/device/metal/function_constants.h b/intern/cycles/kernel/device/metal/function_constants.h index f4001735672..3adf390c7f6 100644 --- a/intern/cycles/kernel/device/metal/function_constants.h +++ b/intern/cycles/kernel/device/metal/function_constants.h @@ -2,6 +2,7 @@ * Copyright 2021-2022 Blender Foundation */ enum { + Kernel_DummyConstant, #define KERNEL_STRUCT_MEMBER(parent, type, name) KernelData_##parent##_##name, #include "kernel/data_template.h" }; |