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/bvh | |
| 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/bvh')
| -rw-r--r-- | intern/cycles/bvh/bvh.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 540bf52f7ac..703639e29f3 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -44,6 +44,7 @@ const char *bvh_layout_name(BVHLayout layout) case BVH_LAYOUT_METAL: return "METAL"; case BVH_LAYOUT_MULTI_OPTIX: + case BVH_LAYOUT_MULTI_METAL: case BVH_LAYOUT_MULTI_OPTIX_EMBREE: case BVH_LAYOUT_MULTI_METAL_EMBREE: return "MULTI"; @@ -115,6 +116,7 @@ BVH *BVH::create(const BVHParams ¶ms, break; #endif case BVH_LAYOUT_MULTI_OPTIX: + case BVH_LAYOUT_MULTI_METAL: case BVH_LAYOUT_MULTI_OPTIX_EMBREE: case BVH_LAYOUT_MULTI_METAL_EMBREE: return new BVHMulti(params, geometry, objects); |