Merge pull request #186 from billhollings/master

Swapchain return VK_ERROR_OUT_OF_DATE_KHR when window resized.
KhronosGroup · Jun 24, 2018 · 699839b · 699839b
2 parents d58fd7e + d34c790
commit 699839b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKQueue.mm b/MoltenVK/MoltenVK/GPUObjects/MVKQueue.mm
@@ -436,7 +436,7 @@
 		MVKSwapchain* mvkSC = (MVKSwapchain*)pPresentInfo->pSwapchains[i];
 		_surfaceImages.push_back(mvkSC->getImage(pPresentInfo->pImageIndices[i]));
 		if (mvkSC->getHasSurfaceSizeChanged()) {
-			_submissionResult = VK_SUBOPTIMAL_KHR;
+			_submissionResult = VK_ERROR_OUT_OF_DATE_KHR;
 		}
 	}
 }

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm
@@ -79,11 +79,11 @@
 
     *pImageIndex = minWaitIndex;	// Return the index of the image with the shortest wait
     _surfaceImages[minWaitIndex]->signalWhenAvailable((MVKSemaphore*)semaphore, (MVKFence*)fence);
-    return getHasSurfaceSizeChanged() ? VK_SUBOPTIMAL_KHR : VK_SUCCESS;
+    return getHasSurfaceSizeChanged() ? VK_ERROR_OUT_OF_DATE_KHR : VK_SUCCESS;
 }
 
 bool MVKSwapchain::getHasSurfaceSizeChanged() {
-	return !CGSizeEqualToSize(_mtlLayer.drawableSize, _mtlLayerOrigDrawSize);
+	return !CGSizeEqualToSize(_mtlLayer.updatedDrawableSizeMVK, _mtlLayerOrigDrawSize);
 }
 
 uint64_t MVKSwapchain::getNextAcquisitionID() { return ++_currentAcquisitionID; }