Make sure we don't try to set a negative viewport size.

Should help #13921.
hrydgard · Jan 16, 2021 · 0386caf · 0386caf
1 parent 19313aa
commit 0386caf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp
@@ -575,6 +575,9 @@ void ConvertViewportAndScissor(bool useBufferedRendering, float renderWidth, flo
 		renderHeightFactor = renderHeight / 272.0f;
 	}
 
+	_assert_(renderWidthFactor > 0.0);
+	_assert_(renderHeightFactor > 0.0);
+
 	renderX = gstate_c.curRTOffsetX;
 
 	// Scissor
@@ -694,8 +697,11 @@ void ConvertViewportAndScissor(bool useBufferedRendering, float renderWidth, flo
 
 		out.viewportX = left * renderWidthFactor + displayOffsetX;
 		out.viewportY = top * renderHeightFactor + displayOffsetY;
-		out.viewportW = (right - left) * renderWidthFactor;
-		out.viewportH = (bottom - top) * renderHeightFactor;
+
+		// The calculations should end up with zero or positive values, but let's protect against any
+		// precision issues. See #13921.
+		out.viewportW = std::max(0.0f, (right - left) * renderWidthFactor);
+		out.viewportH = std::max(0.0f, (bottom - top) * renderHeightFactor);
 
 		// The depth viewport parameters are the same, but we handle it a bit differently.
 		// When clipping is enabled, depth is clamped to [0, 65535].  And minz/maxz discard.

diff --git a/ffmpeg b/ffmpeg
diff --git a/pspautotests b/pspautotests
+1 −1		tests/cpu/cpu_alu/Makefile
+4 −0		tests/cpu/crash/Makefile
+10 −0		tests/cpu/crash/crash_read_f32.c
+ −		tests/cpu/crash/crash_read_f32.prx
+13 −0		tests/cpu/crash/crash_read_u32.c
+ −		tests/cpu/crash/crash_read_u32.prx
+10 −0		tests/cpu/crash/crash_write_f32.c
+ −		tests/cpu/crash/crash_write_f32.prx
+10 −0		tests/cpu/crash/crash_write_u32.c
+ −		tests/cpu/crash/crash_write_u32.prx
+3 −0		tests/cpu/crash/readme.txt