diff options
| author | Michael Jones <michael_p_jones@apple.com> | 2021-12-14 01:20:16 +0300 |
|---|---|---|
| committer | Michael Jones <michael_p_jones@apple.com> | 2021-12-14 01:34:48 +0300 |
| commit | e688c927eb3a82b21ba744ec57540ea2cd4f44c8 (patch) | |
| tree | 294f18f8adf2d7a668d67399939b22239743e551 /intern/cycles/kernel | |
| parent | b8952ecec947308ded826d6025ddfe7d6ff0325e (diff) | |
Fix T94022: Both options GPU/CPU checked under preferences cause viewport render crash. (ARM/Metal)
This fixes crash T94022 when selecting live viewport render with both GPU & CPU devices selected. It is caused by incorrect `KernelBVHLayout` assignment. Similar to `BVH_LAYOUT_MULTI_OPTIX` for Optix, this patch adds a `BVH_LAYOUT_MULTI_METAL` to correctly redirect to the correct Metal BVH layout type.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D13561
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index c39289224ad..34f909a06d9 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -1224,7 +1224,8 @@ typedef enum KernelBVHLayout { BVH_LAYOUT_MULTI_OPTIX = (1 << 3), BVH_LAYOUT_MULTI_OPTIX_EMBREE = (1 << 4), BVH_LAYOUT_METAL = (1 << 5), - BVH_LAYOUT_MULTI_METAL_EMBREE = (1 << 6), + BVH_LAYOUT_MULTI_METAL = (1 << 6), + BVH_LAYOUT_MULTI_METAL_EMBREE = (1 << 7), /* Default BVH layout to use for CPU. */ BVH_LAYOUT_AUTO = BVH_LAYOUT_EMBREE, |