Merge pull request #6786 from stenzek/crop-negative-y

RenderBase: Ensure the draw size does not exceed the window size

1 files changed, 4 insertions, 0 deletions

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index 33e449b56c..97ca4c1696 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -534,6 +534,10 @@ void Renderer::UpdateDrawRectangle()
     crop_width = win_width;
   }
 
+  // Clamp the draw width/height to the screen size, to ensure we don't render off-screen.
+  draw_width = std::min(draw_width, win_width);
+  draw_height = std::min(draw_height, win_height);
+
   // ensure divisibility by 4 to make it compatible with all the video encoders
   draw_width = std::ceil(draw_width) - static_cast<int>(std::ceil(draw_width)) % 4;
   draw_height = std::ceil(draw_height) - static_cast<int>(std::ceil(draw_height)) % 4;