Merge pull request #18816 from hrydgard/more-fixes

Try to resolve another race condition. Improve an assert.
hrydgard · Feb 3, 2024 · 6e676b9 · 6e676b9
2 parents 16d1d55 + 3802d4e
commit 6e676b9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp
@@ -459,6 +459,7 @@ VulkanRenderManager::~VulkanRenderManager() {
 void VulkanRenderManager::CompileThreadFunc() {
 	SetCurrentThreadName("ShaderCompile");
 	while (true) {
+		bool exitAfterCompile = false;
 		std::vector<CompileQueueEntry> toCompile;
 		{
 			std::unique_lock<std::mutex> lock(compileMutex_);
@@ -467,6 +468,9 @@ void VulkanRenderManager::CompileThreadFunc() {
 			}
 			toCompile = std::move(compileQueue_);
 			compileQueue_.clear();
+			if (!runCompileThread_) {
+				exitAfterCompile = true;
+			}
 		}
 
 		int countToCompile = (int)toCompile.size();
@@ -509,7 +513,7 @@ void VulkanRenderManager::CompileThreadFunc() {
 			g_threadManager.EnqueueTask(task);
 		}
 
-		if (!runCompileThread_) {
+		if (exitAfterCompile) {
 			break;
 		}
 

diff --git a/Common/GPU/Vulkan/VulkanRenderManager.h b/Common/GPU/Vulkan/VulkanRenderManager.h
@@ -569,7 +569,8 @@ class VulkanRenderManager {
 	int curHeight_ = -1;
 
 	bool insideFrame_ = false;
-	bool runCompileThread_ = false;
+	// probably doesn't need to be atomic.
+	std::atomic<bool> runCompileThread_;
 
 	bool useRenderThread_ = true;
 	bool measurePresentTime_ = false;

diff --git a/Common/Thread/Promise.h b/Common/Thread/Promise.h
@@ -88,7 +88,8 @@ class Promise {
 	// Returns T if the data is ready, nullptr if it's not.
 	// Obviously, can only be used if T is nullable, otherwise it won't compile.
 	T Poll() {
-		_assert_(sentinel_ == 0xffc0ffee);
+		uint32_t sentinel = sentinel_;
+		_assert_msg_(sentinel == 0xffc0ffee, "%08x", sentinel);
 		std::lock_guard<std::mutex> guard(readyMutex_);
 		if (ready_) {
 			return data_;
@@ -105,7 +106,8 @@ class Promise {
 	}
 
 	T BlockUntilReady() {
-		_assert_(sentinel_ == 0xffc0ffee);
+		uint32_t sentinel = sentinel_;
+		_assert_msg_(sentinel == 0xffc0ffee, "%08x", sentinel);
 		std::lock_guard<std::mutex> guard(readyMutex_);
 		if (ready_) {
 			return data_;