Headless: Fix graphics tests for Vulkan/Direct3D.

Otherwise we hang because there's no thread to ever end.
hrydgard · Jul 29, 2018 · 78dc07e · 78dc07e
1 parent fba0de5
commit 78dc07e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp
@@ -862,6 +862,7 @@ bool TextureCacheGLES::GetCurrentTextureDebug(GPUDebugBuffer &buffer, int level)
 	GLRenderManager *renderManager = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
 
 	// Not a framebuffer, so let's assume these are right.
+	// TODO: But they may definitely not be, if the texture was scaled.
 	int w = gstate.getTextureWidth(level);
 	int h = gstate.getTextureHeight(level);
 

diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
@@ -163,7 +163,7 @@ bool WindowsHeadlessHost::InitGraphics(std::string *error_message, GraphicsConte
 
 void WindowsHeadlessHost::ShutdownGraphics() {
 	gfx_->StopThread();
-	while (threadState_ != RenderThreadState::STOPPED)
+	while (threadState_ != RenderThreadState::STOPPED && threadState_ != RenderThreadState::IDLE)
 		sleep_ms(1);
 
 	gfx_->Shutdown();