diff options
| author | Michael Jones <michael_p_jones@apple.com> | 2021-11-18 16:25:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-18 16:38:05 +0300 |
| commit | d1f944c18634f215c3da0484ac3b80e994118680 (patch) | |
| tree | 7d2b1f4fa3f3ea0673e9eaafdfca533547f7323b /intern/cycles/kernel/device/gpu | |
| parent | d19e35873f67c90b251ca38e007a83aa1eada211 (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/gpu')
| -rw-r--r-- | intern/cycles/kernel/device/gpu/kernel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h index 60332af752c..22e2a61a06d 100644 --- a/intern/cycles/kernel/device/gpu/kernel.h +++ b/intern/cycles/kernel/device/gpu/kernel.h @@ -21,6 +21,9 @@ #include "kernel/device/gpu/parallel_sorted_index.h" #include "kernel/device/gpu/work_stealing.h" +/* Include constant tables before entering Metal's context class scope (context_begin.h) */ +#include "kernel/tables.h" + #ifdef __KERNEL_METAL__ # include "kernel/device/metal/context_begin.h" #endif |