Merge branch 'master' into metal

This commit is contained in:
Raph Levien 2021-05-28 14:05:08 -07:00
commit af4b568589

View file

@ -351,7 +351,7 @@ impl Device {
.copied() .copied()
.map(Semaphore::dx12) .map(Semaphore::dx12)
.collect::<SmallVec<[_; 4]>>(), .collect::<SmallVec<[_; 4]>>(),
fence.map(Fence::dx12_mut_mut), fence.map(Fence::dx12_mut),
), ),
Device::Mtl(d) => d.run_cmd_bufs( Device::Mtl(d) => d.run_cmd_bufs(
&cmd_bufs &cmd_bufs