Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-20 09:24:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

VideoCommon: avoid assuming global state exists for 'EndUtilityDrawing', use last stored viewport/scissor rect instead

Browse Source
This commit is contained in:
iwubcode
2025-11-13 21:44:29 -06:00
parent 2acb49544c
commit a4599a1add
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/VideoCommon/AbstractGfx.cpp
View File

@@ -34,10 +34,15 @@ void AbstractGfx::BeginUtilityDrawing()
void AbstractGfx::EndUtilityDrawing()
{
// Reset framebuffer/scissor/viewport. Pipeline will be reset at next draw.
// Reset framebuffer. Pipeline will be reset at next draw.
g_framebuffer_manager->BindEFBFramebuffer();
BPFunctions::SetScissorAndViewport(g_framebuffer_manager.get(), bpmem.scissorTL, bpmem.scissorBR,
bpmem.scissorOffset, xfmem.viewport);
// Reset our viewport and scissor to the last stored value
SetViewport(m_viewport_and_scissor.viewport_x, m_viewport_and_scissor.viewport_y,
m_viewport_and_scissor.viewport_width, m_viewport_and_scissor.viewport_height,
m_viewport_and_scissor.viewport_near_depth,
m_viewport_and_scissor.viewport_far_depth);
SetScissorRect(m_viewport_and_scissor.scissor_rect);
}
void AbstractGfx::SetFramebuffer(AbstractFramebuffer* framebuffer)
@@ -87,6 +92,11 @@ void AbstractGfx::ClearRegion(const MathUtil::Rectangle<int>& target_rc, bool co
EndUtilityDrawing();
}
void AbstractGfx::StoreViewportAndScissor(const ViewportAndScissor& viewport_and_scissor)
{
m_viewport_and_scissor = viewport_and_scissor;
}
void AbstractGfx::SetViewportAndScissor(const MathUtil::Rectangle<int>& rect, float min_depth,
float max_depth)
{