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

Remove error logging on VK_TIMEOUT of VkSemaphore and VkFence.

Browse Source
This commit is contained in:
Bill Hollings 2019-08-08 17:10:35 -04:00
parent 7dc642196a
commit 95def90d06
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Docs/Whats_New.md
View File

@ -22,6 +22,7 @@ Released TBD
- Revert to supporting host-coherent memory for linear images on macOS.
- Ensure Vulkan loader magic number is set every time before returning any dispatchable Vulkan handle.
- Fix crash when `VkDeviceCreateInfo` specifies queue families out of numerical order.
- Remove error logging on `VK_TIMEOUT` of `VkSemaphore` and `VkFence`.
- Consolidate the various linkable objects into a `MVKLinkableMixin` template base class.
- Use `MVKVector` whenever possible in MoltenVK, especially within render loop.

17
MoltenVK/MoltenVK/GPUObjects/MVKSync.mm
View File

@ -80,15 +80,9 @@ MVKSemaphoreImpl::~MVKSemaphoreImpl() {
#pragma mark -
#pragma mark MVKSemaphore
bool MVKSemaphore::wait(uint64_t timeout) {
bool isDone = _blocker.wait(timeout, true);
if ( !isDone && timeout > 0 ) { reportError(VK_TIMEOUT, "Vulkan semaphore timeout after %llu nanoseconds.", timeout); }
return isDone;
}
bool MVKSemaphore::wait(uint64_t timeout) { return _blocker.wait(timeout, true); }
void MVKSemaphore::signal() {
_blocker.release();
}
void MVKSemaphore::signal() { _blocker.release(); }
void MVKSemaphore::encodeWait(id<MTLCommandBuffer> cmdBuff) {
[cmdBuff encodeWaitForEvent: _mtlEvent value: _mtlEventValue];
@ -254,12 +248,7 @@ VkResult mvkWaitForFences(MVKDevice* device,
((MVKFence*)pFences[i])->addSitter(&fenceSitter);
}
if ( !fenceSitter.wait(timeout) ) {
rslt = VK_TIMEOUT;
if (timeout > 0) {
device->reportError(rslt, "Vulkan fence timeout after %llu nanoseconds.", timeout);
}
}
if ( !fenceSitter.wait(timeout) ) { rslt = VK_TIMEOUT; }
for (uint32_t i = 0; i < fenceCount; i++) {
((MVKFence*)pFences[i])->removeSitter(&fenceSitter);