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/util
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/util')
-rw-r--r--intern/cycles/util/defines.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/util/defines.h b/intern/cycles/util/defines.h
index edc36b14745..a2e8d83adb7 100644
--- a/intern/cycles/util/defines.h
+++ b/intern/cycles/util/defines.h
@@ -72,7 +72,7 @@
/* Address spaces for GPU. */
# define ccl_global
-# define ccl_static_constant static const
+# define ccl_inline_constant inline constexpr
# define ccl_constant const
# define ccl_private