~GPU_Vulkan: Check that we still have a draw_ pointer before trying t…

…o drain the compile queue.
hrydgard · May 3, 2023 · c9b7c81 · c9b7c81
1 parent 0e2fb13
commit c9b7c81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Common/GPU/OpenGL/GLRenderManager.cpp b/Common/GPU/OpenGL/GLRenderManager.cpp
@@ -640,7 +640,7 @@ void GLPushBuffer::Defragment() {
 	_dbg_assert_msg_(!OnRenderThread(), "Defragment must not run on the render thread");
 
 	if (buffers_.size() <= 1) {
-		// Let's take this chance to jetison localMemory we don't need.
+		// Let's take this opportunity to jettison any localMemory we don't need.
 		for (auto &info : buffers_) {
 			if (info.deviceMemory) {
 				FreeAlignedMemory(info.localMemory);

diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -182,8 +182,10 @@ void GPU_Vulkan::SaveCache(const Path &filename) {
 }
 
 GPU_Vulkan::~GPU_Vulkan() {
-	VulkanRenderManager *rm = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
-	rm->DrainCompileQueue();
+	if (draw_) {
+		VulkanRenderManager *rm = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
+		rm->DrainCompileQueue();
+	}
 
 	SaveCache(shaderCachePath_);
 	// Note: We save the cache in DeviceLost