Page MenuHome
Differential D13561

Fix T94022: Both options GPU/CPU checked under preferences cause viewport render crash. (ARM/Metal)
ClosedPublic
Actions

Authored by Michael Jones (michael_jones) on Dec 13 2021, 11:20 PM.

Details

Reviewers
Brecht Van Lommel (brecht)
Commits
rC0d59450bb0b7: Fix T94022: Both options GPU/CPU checked under preferences cause viewport…
rBe688c927eb3a: Fix T94022: Both options GPU/CPU checked under preferences cause viewport…
Summary

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.

Diff Detail

Repository
rB Blender
Branch
master
Build Status
Buildable 19401
Build 19401: arc lint + arc unit

Revision Contents
Changeset List

PathSize
intern/
cycles/
bvh/
2 lines
device/
multi/
8 lines
kernel/
3 lines
scene/
2 lines
2 lines

Diff 45997

View Options

intern/cycles/bvh/bvh.cpp

Loading...
View Options

intern/cycles/device/multi/device.cpp

Loading...
View Options

intern/cycles/kernel/types.h

Loading...
View Options

intern/cycles/scene/geometry.cpp

Loading...
View Options

intern/cycles/scene/object.cpp

Loading...