Merge pull request #3504 from degasus/master

VideoBackend: Cleanup API a bit.

11 files changed, 15 insertions, 16 deletions

diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index dfe1408ada..9ecd0a7667 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -718,7 +718,7 @@ void formatBufferDump(const u8* in, u8* out, int w, int h, int p)
 // This function has the final picture. We adjust the aspect ratio here.
 void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, const EFBRectangle& rc, float Gamma)
 {
-	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
+	if (Fifo::g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
 	{
 		if (SConfig::GetInstance().m_DumpFrames && !frame_data.empty())
 			AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
index 7ab12f7d9d..7f9b54821e 100644
--- a/Source/Core/VideoBackends/D3D/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -10,7 +10,7 @@
 namespace DX11
 {
 
-class VideoBackend : public VideoBackendHardware
+class VideoBackend : public VideoBackendBase
 {
 	bool Initialize(void*) override;
 	void Shutdown() override;
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index d74cbbbfdf..9bd7b685f1 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -183,7 +183,7 @@ void VideoBackend::Video_Prepare()
 
 	// VideoCommon
 	BPInit();
-	Fifo_Init();
+	Fifo::Init();
 	IndexGenerator::Init();
 	VertexLoaderManager::Init();
 	OpcodeDecoder_Init();
@@ -206,7 +206,7 @@ void VideoBackend::Shutdown()
 	if (g_renderer)
 	{
 		// VideoCommon
-		Fifo_Shutdown();
+		Fifo::Shutdown();
 		CommandProcessor::Shutdown();
 		GeometryShaderManager::Shutdown();
 		PixelShaderManager::Shutdown();
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index ce332c0b98..5e043ee5da 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -1235,7 +1235,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
 	}
 
 	static int w = 0, h = 0;
-	if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
+	if (Fifo::g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
 	{
 		DumpFrame(frame_data, w, h);
 		Core::Callback_VideoCopiedToXFB(false);
diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h
index e42813c3cb..ccac9767fe 100644
--- a/Source/Core/VideoBackends/OGL/VideoBackend.h
+++ b/Source/Core/VideoBackends/OGL/VideoBackend.h
@@ -10,7 +10,7 @@
 namespace OGL
 {
 
-class VideoBackend : public VideoBackendHardware
+class VideoBackend : public VideoBackendBase
 {
 	bool Initialize(void *) override;
 	void Shutdown() override;
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index 1134b26302..07648b6acd 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -181,7 +181,7 @@ void VideoBackend::Video_Prepare()
 	BPInit();
 	g_vertex_manager = std::make_unique<VertexManager>();
 	g_perf_query = GetPerfQuery();
-	Fifo_Init(); // must be done before OpcodeDecoder_Init()
+	Fifo::Init(); // must be done before OpcodeDecoder_Init()
 	OpcodeDecoder_Init();
 	IndexGenerator::Init();
 	VertexShaderManager::Init();
@@ -215,7 +215,7 @@ void VideoBackend::Video_Cleanup()
 	if (!g_renderer)
 		return;
 
-	Fifo_Shutdown();
+	Fifo::Shutdown();
 
 	// The following calls are NOT Thread Safe
 	// And need to be called from the video thread
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;