diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-13 01:27:24 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-13 01:27:24 +0100 |
| commit | 8f8134f5f4da2ff29f58c8f373ed1f5c64bcdf71 (patch) | |
| tree | 74f8317e0e5e161a21c636a6388cc3013bfe837c /Source/Core/VideoBackends/Software | |
| parent | 82f3b94ad7a344972a26cb87d4ab362fd1397738 (diff) | |
| parent | aa430c10d573b5e73154b8fbb7d661a58e44df68 (diff) | |
Merge pull request #3504 from degasus/master
VideoBackend: Cleanup API a bit.
Diffstat (limited to 'Source/Core/VideoBackends/Software')
5 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 493fe51352..e7f3089027 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -191,7 +191,7 @@ void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *nam void OnObjectBegin() { - if (!g_bSkipCurrentFrame) + if (!Fifo::g_bSkipCurrentFrame) { if (g_ActiveConfig.bDumpTextures && stats.thisFrame.numDrawnObjects >= g_ActiveConfig.drawStart && stats.thisFrame.numDrawnObjects < g_ActiveConfig.drawEnd) DumpActiveTextures(); @@ -200,7 +200,7 @@ void OnObjectBegin() void OnObjectEnd() { - if (!g_bSkipCurrentFrame) + if (!Fifo::g_bSkipCurrentFrame) { if (g_ActiveConfig.bDumpObjects && stats.thisFrame.numDrawnObjects >= g_ActiveConfig.drawStart && stats.thisFrame.numDrawnObjects < g_ActiveConfig.drawEnd) DumpEfb(StringFromFormat("%sobject%i.png", diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp index 9637ef7af0..1111960c6f 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.cpp +++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp @@ -73,7 +73,7 @@ namespace EfbCopy rc.right = rc.left + (int)bpmem.copyTexSrcWH.x + 1; rc.bottom = rc.top + (int)bpmem.copyTexSrcWH.y + 1; - if (!g_bSkipCurrentFrame) + if (!Fifo::g_bSkipCurrentFrame) { if (bpmem.triggerEFBCopy.copy_to_xfb) { diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index ba3f2a9fcc..0aa5bdb50a 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -108,7 +108,7 @@ void SWRenderer::UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidt // Called on the GPU thread void SWRenderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma) { - if (!g_bSkipCurrentFrame) + if (!Fifo::g_bSkipCurrentFrame) { if (g_ActiveConfig.bUseXFB) diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index a2ed4ff3a0..8600297e9c 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -198,8 +198,7 @@ void VideoSoftware::Video_Cleanup() { if (g_renderer) { - Fifo_Shutdown(); - + Fifo::Shutdown(); SWRenderer::Shutdown(); DebugUtil::Shutdown(); // The following calls are NOT Thread Safe @@ -228,7 +227,7 @@ void VideoSoftware::Video_Prepare() BPInit(); g_vertex_manager = std::make_unique<SWVertexLoader>(); g_perf_query = std::make_unique<PerfQuery>(); - Fifo_Init(); // must be done before OpcodeDecoder_Init() + Fifo::Init(); // must be done before OpcodeDecoder_Init() OpcodeDecoder_Init(); IndexGenerator::Init(); VertexShaderManager::Init(); diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h index 7d9d4437db..c7f5d5c535 100644 --- a/Source/Core/VideoBackends/Software/VideoBackend.h +++ b/Source/Core/VideoBackends/Software/VideoBackend.h @@ -12,7 +12,7 @@ namespace MMIO { class Mapping; } namespace SW { -class VideoSoftware : public VideoBackendHardware +class VideoSoftware : public VideoBackendBase { bool Initialize(void *window_handle) override; void Shutdown() override; |