AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhi: vulkan: Report device lost

Browse Source 
Typically caught in vkQueueSubmit().

The WaitIdles that can be hit upon cleanup must be guarded by
!deviceLost because they inexplicably cause an infinite blocking
wait when the device was already reported as lost. (with NVIDIA
at least)

Change-Id: I7142e2461e1aed9ee3068b2b963cdf2c678ca4e0
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
This commit is contained in:
Laszlo Agocs 2019-09-10 16:49:58 +02:00
parent 0616e14de0
commit 8fef0ffc16
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/gui/rhi/qrhivulkan.cpp
View File

@ -589,6 +589,8 @@ bool QRhiVulkan::create(QRhi::Flags flags)
vkDebugMarkerSetObjectName = reinterpret_cast<PFN_vkDebugMarkerSetObjectNameEXT>(f->vkGetDeviceProcAddr(dev, "vkDebugMarkerSetObjectNameEXT"));
}
deviceLost = false;
nativeHandlesStruct.physDev = physDev;
nativeHandlesStruct.dev = dev;
nativeHandlesStruct.gfxQueueFamilyIdx = gfxQueueFamilyIdx;
@ -604,6 +606,7 @@ void QRhiVulkan::destroy()
if (!df)
return;
if (!deviceLost)
df->vkDeviceWaitIdle(dev);
executeDeferredReleases(true);
@ -1425,6 +1428,7 @@ void QRhiVulkan::releaseSwapChainResources(QRhiSwapChain *swapChain)
if (swapChainD->sc == VK_NULL_HANDLE)
return;
if (!deviceLost)
df->vkDeviceWaitIdle(dev);
for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i) {
@ -1488,15 +1492,6 @@ void QRhiVulkan::releaseSwapChainResources(QRhiSwapChain *swapChain)
// NB! surface and similar must remain intact
}
static inline bool checkDeviceLost(VkResult err)
{
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device lost");
return true;
}
return false;
}
QRhi::FrameOpResult QRhiVulkan::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginFrameFlags flags)
{
QVkSwapChain *swapChainD = QRHI_RES(QVkSwapChain, swapChain);
@ -1523,9 +1518,11 @@ QRhi::FrameOpResult QRhiVulkan::beginFrame(QRhiSwapChain *swapChain, QRhi::Begin
} else if (err == VK_ERROR_OUT_OF_DATE_KHR) {
return QRhi::FrameOpSwapChainOutOfDate;
} else {
if (checkDeviceLost(err))
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device loss detected in vkAcquireNextImageKHR()");
deviceLost = true;
return QRhi::FrameOpDeviceLost;
else
}
qWarning("Failed to acquire next swapchain image: %d", err);
return QRhi::FrameOpError;
}
@ -1690,9 +1687,11 @@ QRhi::FrameOpResult QRhiVulkan::endFrame(QRhiSwapChain *swapChain, QRhi::EndFram
if (err == VK_ERROR_OUT_OF_DATE_KHR) {
return QRhi::FrameOpSwapChainOutOfDate;
} else if (err != VK_SUBOPTIMAL_KHR) {
if (checkDeviceLost(err))
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device loss detected in vkQueuePresentKHR()");
deviceLost = true;
return QRhi::FrameOpDeviceLost;
else
}
qWarning("Failed to present: %d", err);
return QRhi::FrameOpError;
}
@ -1750,9 +1749,11 @@ QRhi::FrameOpResult QRhiVulkan::startPrimaryCommandBuffer(VkCommandBuffer *cb)
VkResult err = df->vkAllocateCommandBuffers(dev, &cmdBufInfo, cb);
if (err != VK_SUCCESS) {
if (checkDeviceLost(err))
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device loss detected in vkAllocateCommandBuffers()");
deviceLost = true;
return QRhi::FrameOpDeviceLost;
else
}
qWarning("Failed to allocate frame command buffer: %d", err);
return QRhi::FrameOpError;
}
@ -1763,9 +1764,11 @@ QRhi::FrameOpResult QRhiVulkan::startPrimaryCommandBuffer(VkCommandBuffer *cb)
err = df->vkBeginCommandBuffer(*cb, &cmdBufBeginInfo);
if (err != VK_SUCCESS) {
if (checkDeviceLost(err))
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device loss detected in vkBeginCommandBuffer()");
deviceLost = true;
return QRhi::FrameOpDeviceLost;
else
}
qWarning("Failed to begin frame command buffer: %d", err);
return QRhi::FrameOpError;
}
@ -1778,9 +1781,11 @@ QRhi::FrameOpResult QRhiVulkan::endAndSubmitPrimaryCommandBuffer(VkCommandBuffer
{
VkResult err = df->vkEndCommandBuffer(cb);
if (err != VK_SUCCESS) {
if (checkDeviceLost(err))
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device loss detected in vkEndCommandBuffer()");
deviceLost = true;
return QRhi::FrameOpDeviceLost;
else
}
qWarning("Failed to end frame command buffer: %d", err);
return QRhi::FrameOpError;
}
@ -1803,9 +1808,11 @@ QRhi::FrameOpResult QRhiVulkan::endAndSubmitPrimaryCommandBuffer(VkCommandBuffer
err = df->vkQueueSubmit(gfxQueue, 1, &submitInfo, cmdFence);
if (err != VK_SUCCESS) {
if (checkDeviceLost(err))
if (err == VK_ERROR_DEVICE_LOST) {
qWarning("Device loss detected in vkQueueSubmit()");
deviceLost = true;
return QRhi::FrameOpDeviceLost;
else
}
qWarning("Failed to submit to graphics queue: %d", err);
return QRhi::FrameOpError;
}
@ -3752,7 +3759,7 @@ void QRhiVulkan::releaseCachedResources()
bool QRhiVulkan::isDeviceLost() const
{
return false;
return deviceLost;
}
QRhiRenderBuffer *QRhiVulkan::createRenderBuffer(QRhiRenderBuffer::Type type, const QSize &pixelSize,

1
src/gui/rhi/qrhivulkan_p_p.h
View File

@ -805,6 +805,7 @@ public:
VkDeviceSize ubufAlign;
VkDeviceSize texbufAlign;
bool hasWideLines = false;
bool deviceLost = false;
bool debugMarkersAvailable = false;
bool vertexAttribDivisorAvailable = false;