From 600d1fc0bc884644127057fa8cce5d31cbaef143 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 10 Oct 2018 01:26:31 +1100 Subject: Renderer: Use imgui for drawing debug text and OSD --- Source/Core/VideoBackends/Software/SWRenderer.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWRenderer.cpp') diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index 0b64022725..f8032f7e5d 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -97,13 +97,8 @@ std::unique_ptr SWRenderer::CreatePipeline(const AbstractPipel // Called on the GPU thread void SWRenderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region, u64 ticks) { - OSD::DoCallbacks(OSD::CallbackType::OnFrame); - if (!IsHeadless()) - { - DrawDebugText(); m_window->ShowImage(texture, xfb_region); - } UpdateActiveConfig(); } -- cgit v1.2.3 From 63dd91628de0c9e8c7a25c403b7900675c515d36 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 10 Oct 2018 01:34:26 +1100 Subject: Remove old RasterFont classes --- Source/Core/VideoBackends/Software/SWRenderer.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWRenderer.cpp') diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index f8032f7e5d..0dac3b264b 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -55,11 +55,6 @@ SWRenderer::CreateFramebuffer(const AbstractTexture* color_attachment, static_cast(depth_attachment)); } -void SWRenderer::RenderText(const std::string& pstr, int left, int top, u32 color) -{ - m_window->PrintText(pstr, left, top, color); -} - class SWShader final : public AbstractShader { public: -- cgit v1.2.3 From c9c0b8505615cb16a770d66650e89c0f41d00dc8 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 19 Jan 2019 00:35:00 +1000 Subject: VideoBackends: Store a backbuffer 'scale' This is a scaling factor, used for hi-dpi configurations. --- Source/Core/VideoBackends/Software/SWRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWRenderer.cpp') diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index 0dac3b264b..edddd5156f 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -25,7 +25,7 @@ #include "VideoCommon/VideoConfig.h" SWRenderer::SWRenderer(std::unique_ptr window) - : ::Renderer(static_cast(MAX_XFB_WIDTH), static_cast(MAX_XFB_HEIGHT), + : ::Renderer(static_cast(MAX_XFB_WIDTH), static_cast(MAX_XFB_HEIGHT), 1.0f, AbstractTextureFormat::RGBA8), m_window(std::move(window)) { -- cgit v1.2.3 From e4b205c76937d379cd9043939e2cef1651b1a21b Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 28 Nov 2018 14:30:47 +1000 Subject: Decouple XFB scanout from presentation --- Source/Core/VideoBackends/Software/SWRenderer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWRenderer.cpp') diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index edddd5156f..6369b35b20 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -90,12 +90,10 @@ std::unique_ptr SWRenderer::CreatePipeline(const AbstractPipel } // Called on the GPU thread -void SWRenderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region, u64 ticks) +void SWRenderer::RenderXFBToScreen(const AbstractTexture* texture, const EFBRectangle& xfb_region) { if (!IsHeadless()) m_window->ShowImage(texture, xfb_region); - - UpdateActiveConfig(); } u32 SWRenderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData) -- cgit v1.2.3