encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manually retain/release mPendingCommands (#208) 

Fixes a crash for me on macOS+Metal
This commit is contained in:
Kai Ninomiya 2018-07-03 12:19:28 -07:00 committed by GitHub
parent f53f98bf86
commit 66c06f42f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/metal/DeviceMTL.mm
View File

@ -66,7 +66,8 @@ namespace backend { namespace metal {
} }
Tick(); Tick();
mPendingCommands = nil; // This will be autoreleased. [mPendingCommands release];
mPendingCommands = nil;
delete mMapTracker; delete mMapTracker;
mMapTracker = nullptr; mMapTracker = nullptr;
@ -155,6 +156,7 @@ namespace backend { namespace metal {
id<MTLCommandBuffer> Device::GetPendingCommandBuffer() { id<MTLCommandBuffer> Device::GetPendingCommandBuffer() {
if (mPendingCommands == nil) { if (mPendingCommands == nil) {
mPendingCommands = [mCommandQueue commandBuffer]; mPendingCommands = [mCommandQueue commandBuffer];
[mPendingCommands retain];
} }
return mPendingCommands; return mPendingCommands;
} }
@ -174,7 +176,8 @@ namespace backend { namespace metal {
}]; }];
[mPendingCommands commit]; [mPendingCommands commit];
mPendingCommands = nil; // This will be autoreleased. [mPendingCommands release];
mPendingCommands = nil;
mPendingCommandSerial++; mPendingCommandSerial++;
} }