[Bf-blender-cvs] [bb376da6dfd] master: Fix Cycles MetalRT error after recent specialization changes

[Brecht Van Lommel]

Commit: bb376da6dfdd2476fc3738ce1fc89dac27825cef
Author: Brecht Van Lommel
Date:   Fri Jul 15 18:00:45 2022 +0200
Branches: master
https://developer.blender.org/rBbb376da6dfdd2476fc3738ce1fc89dac27825cef

Fix Cycles MetalRT error after recent specialization changes

===================================================================

M	intern/cycles/kernel/device/gpu/kernel.h
M	intern/cycles/kernel/device/metal/function_constants.h

===================================================================

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"
 };