Merge pull request #15881 from unknownbrackets/headless

Headless: Fix comparison for oversized buffers
hrydgard · Aug 22, 2022 · 39cb2f1 · 39cb2f1
2 parents 0cb29db + 05ad644
commit 39cb2f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/headless/Compare.cpp b/headless/Compare.cpp
@@ -326,7 +326,7 @@ std::vector<u32> TranslateDebugBufferToCompare(const GPUDebugBuffer *buffer, u32
 	int outStride = buffer->GetStride();
 	if (!buffer->GetFlipped()) {
 		// Bitmaps are flipped, so we have to compare backwards in this case.
-		int toLastRow = outStride * (buffer->GetHeight() - 1);
+		int toLastRow = outStride * (h > buffer->GetHeight() ? buffer->GetHeight() - 1 : h - 1);
 		pixels32 += toLastRow;
 		pixels16 += toLastRow;
 		outStride = -outStride;

diff --git a/headless/Headless.cpp b/headless/Headless.cpp
@@ -416,6 +416,7 @@ int main(int argc, const char* argv[])
 	g_Config.bEnableLogging = fullLog;
 	g_Config.bSoftwareSkinning = true;
 	g_Config.bVertexDecoderJit = true;
+	g_Config.bSoftwareRendering = coreParameter.gpuCore == GPUCORE_SOFTWARE;
 	g_Config.bSoftwareRenderingJit = true;
 	g_Config.bBlockTransferGPU = true;
 	g_Config.iSplineBezierQuality = 2;