Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a possible race condition around MVKMTLBufferAllocation.

Browse Source 
I don't think a race is actually possible here, but this makes Thread
Sanitizer happy.
This commit is contained in:
Chip Davis 2019-02-27 15:07:20 -06:00
parent a1be5a37d3
commit d50e654acd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MoltenVK/MoltenVK/Commands/MVKCommandBuffer.mm
View File

@ -452,10 +452,11 @@ void MVKCommandEncoder::setComputeBytes(id<MTLComputeCommandEncoder> mtlEncoder,
const MVKMTLBufferAllocation* MVKCommandEncoder::getTempMTLBuffer(NSUInteger length) {
const MVKMTLBufferAllocation* mtlBuffAlloc = getCommandEncodingPool()->acquireMTLBufferAllocation(length);
MVKMTLBufferAllocationPool* pool = mtlBuffAlloc->getPool();
// Return the MTLBuffer allocation to the pool once the command buffer is done with it
[_mtlCmdBuffer addCompletedHandler: ^(id<MTLCommandBuffer> mcb) {
((MVKMTLBufferAllocation*)mtlBuffAlloc)->returnToPool();
pool->returnObjectSafely((MVKMTLBufferAllocation*)mtlBuffAlloc);
}];
return mtlBuffAlloc;

3
MoltenVK/MoltenVK/Commands/MVKMTLBufferAllocation.h
View File

@ -44,6 +44,9 @@ public:
*/
inline void* getContents() const { return (void*)((uintptr_t)_mtlBuffer.contents + _offset); }
/** Returns the pool whence this object was created. */
MVKMTLBufferAllocationPool* getPool() const { return _pool; }
/** Returns this object back to the pool that created it. This will reset the value of _next member. */
void returnToPool();