diff --git a/Source/Core/VideoCommon/AbstractGfx.cpp b/Source/Core/VideoCommon/AbstractGfx.cpp index 17c95b863a8..74fb12ddbf2 100644 --- a/Source/Core/VideoCommon/AbstractGfx.cpp +++ b/Source/Core/VideoCommon/AbstractGfx.cpp @@ -7,6 +7,7 @@ #include "VideoCommon/AbstractFramebuffer.h" #include "VideoCommon/AbstractTexture.h" +#include "VideoCommon/BPFunctions.h" #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/ShaderCache.h" @@ -22,14 +23,14 @@ bool AbstractGfx::IsHeadless() const void AbstractGfx::BeginUtilityDrawing() { - if (g_renderer) - g_renderer->BeginUtilityDrawing(); + g_vertex_manager->Flush(); } void AbstractGfx::EndUtilityDrawing() { - if (g_renderer) - g_renderer->EndUtilityDrawing(); + // Reset framebuffer/scissor/viewport. Pipeline will be reset at next draw. + g_framebuffer_manager->BindEFBFramebuffer(); + BPFunctions::SetScissorAndViewport(); } void AbstractGfx::SetFramebuffer(AbstractFramebuffer* framebuffer) diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 1bd0420a483..89e84d2d6e5 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -95,18 +95,6 @@ bool Renderer::Initialize() return true; } -void Renderer::BeginUtilityDrawing() -{ - g_vertex_manager->Flush(); -} - -void Renderer::EndUtilityDrawing() -{ - // Reset framebuffer/scissor/viewport. Pipeline will be reset at next draw. - g_framebuffer_manager->BindEFBFramebuffer(); - BPFunctions::SetScissorAndViewport(); -} - bool Renderer::EFBHasAlphaChannel() const { return m_prev_efb_format == PixelFormat::RGBA6_Z24; diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 67761104920..2a154c4f305 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -68,8 +68,6 @@ public: virtual bool Initialize(); - void BeginUtilityDrawing(); - void EndUtilityDrawing(); // Ideal internal resolution - multiple of the native EFB resolution int GetTargetWidth() const { return m_target_width; } int GetTargetHeight() const { return m_target_height; }