Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Jones <michael_p_jones@apple.com>2021-11-18 16:25:30 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-11-18 16:38:05 +0300
commitd1f944c18634f215c3da0484ac3b80e994118680 (patch)
tree7d2b1f4fa3f3ea0673e9eaafdfca533547f7323b /intern/cycles/kernel/device/cuda/compat.h
parentd19e35873f67c90b251ca38e007a83aa1eada211 (diff)
Cycles: declare constants at program scope on Metal
MSL requires that constant address space literals be declared at program scope. This patch moves the `blackbody_table_r/g/b` and `cie_colour_match` constants into separate files so they can be declared at the appropriate scope. Ref T92212 Differential Revision: https://developer.blender.org/D13241
Diffstat (limited to 'intern/cycles/kernel/device/cuda/compat.h')
-rw-r--r--intern/cycles/kernel/device/cuda/compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/device/cuda/compat.h b/intern/cycles/kernel/device/cuda/compat.h
index 7f901510329..658dec102b1 100644
--- a/intern/cycles/kernel/device/cuda/compat.h
+++ b/intern/cycles/kernel/device/cuda/compat.h
@@ -54,7 +54,7 @@ typedef unsigned long long uint64_t;
#define ccl_device_noinline_cpu ccl_device
#define ccl_device_inline_method ccl_device
#define ccl_global
-#define ccl_static_constant __constant__
+#define ccl_inline_constant __constant__
#define ccl_device_constant __constant__ __device__
#define ccl_constant const
#define ccl_gpu_shared __shared__