From bb376da6dfdd2476fc3738ce1fc89dac27825cef Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 15 Jul 2022 18:00:45 +0200 Subject: Fix Cycles MetalRT error after recent specialization changes --- intern/cycles/kernel/device/gpu/kernel.h | 2 +- intern/cycles/kernel/device/metal/function_constants.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'intern') 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" }; -- cgit v1.2.3