ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoBackend: Get rid of a boolean global 

Also gets rid of global headers
This commit is contained in:
Lioncash 2016-01-02 15:01:12 -05:00
parent 066af14272
commit 01f99a04a2
26 changed files with 32 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/LinearDiskCache.h
View File

@ -8,6 +8,7 @@
#include <fstream>
#include <string>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"

2
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -23,12 +23,10 @@
#include "Common/FileUtil.h"
#include "Common/SysConf.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "DolphinWX/Frame.h"
#include "DolphinWX/Main.h"
#include "DolphinWX/VideoConfigDiag.h"
#include "DolphinWX/WxUtils.h"
#include "VideoBackends/OGL/main.h"
#include "VideoCommon/PostProcessing.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h"

2
Source/Core/VideoBackends/D3D/D3D.vcxproj
View File

@ -66,8 +66,6 @@
<ClInclude Include="D3DUtil.h" />
<ClInclude Include="FramebufferManager.h" />
<ClInclude Include="GeometryShaderCache.h" />
<ClInclude Include="Globals.h" />
<ClInclude Include="main.h" />
<ClInclude Include="PerfQuery.h" />
<ClInclude Include="PixelShaderCache.h" />
<ClInclude Include="PSTextureEncoder.h" />

2
Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
View File

@ -123,8 +123,6 @@
<ClInclude Include="XFBEncoder.h">
<Filter>Render</Filter>
</ClInclude>
<ClInclude Include="Globals.h" />
<ClInclude Include="main.h" />
<ClInclude Include="VideoBackend.h" />
<ClInclude Include="BoundingBox.h">
<Filter>Render</Filter>

1
Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp
View File

@ -14,7 +14,6 @@
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/GeometryShaderCache.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/GeometryShaderGen.h"

12
Source/Core/VideoBackends/D3D/Globals.h
View File

@ -1,12 +0,0 @@
// Copyright 2008 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include "Common/Common.h"
#include "VideoBackends/D3D/main.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"

2
Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
View File

@ -4,6 +4,7 @@
#include <string>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/LinearDiskCache.h"
#include "Common/StringUtil.h"
@ -12,7 +13,6 @@
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoCommon/Debugger.h"

6
Source/Core/VideoBackends/D3D/VertexManager.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/CommonTypes.h"
#include "VideoBackends/D3D/BoundingBox.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DState.h"
@ -14,13 +16,9 @@
#include "VideoCommon/BoundingBox.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11

2
Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
View File

@ -4,6 +4,7 @@
#include <string>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/LinearDiskCache.h"
#include "Common/StringUtil.h"
@ -11,7 +12,6 @@
#include "Core/ConfigManager.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoCommon/Debugger.h"

12
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -5,22 +5,20 @@
#include <memory>
#include <string>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Common/StringUtil.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "VideoBackends/D3D/BoundingBox.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/GeometryShaderCache.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoBackends/D3D/PerfQuery.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/TextureCache.h"
#include "VideoBackends/D3D/VertexManager.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
@ -31,7 +29,6 @@
#include "VideoCommon/Fifo.h"
#include "VideoCommon/GeometryShaderManager.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/PixelShaderManager.h"
@ -163,8 +160,7 @@ bool VideoBackend::Initialize(void *window_handle)
UpdateActiveConfig();
m_window_handle = window_handle;
s_BackendInitialized = true;
m_initialized = true;
return true;
}
@ -200,7 +196,7 @@ void VideoBackend::Video_Prepare()
void VideoBackend::Shutdown()
{
s_BackendInitialized = false;
m_initialized = false;
// TODO: should be in Video_Cleanup
if (g_renderer)

8
Source/Core/VideoBackends/D3D/main.h
View File

@ -1,8 +0,0 @@
// Copyright 2008 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include "VideoBackends/D3D/Render.h"
#include "VideoCommon/MainBase.h"

1
Source/Core/VideoBackends/OGL/OGL.vcxproj
View File

@ -53,7 +53,6 @@
<ItemGroup>
<ClInclude Include="BoundingBox.h" />
<ClInclude Include="FramebufferManager.h" />
<ClInclude Include="main.h" />
<ClInclude Include="PerfQuery.h" />
<ClInclude Include="PostProcessing.h" />
<ClInclude Include="ProgramShaderCache.h" />

1
Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
View File

@ -88,7 +88,6 @@
<ClInclude Include="TextureCache.h">
<Filter>Render</Filter>
</ClInclude>
<ClInclude Include="main.h" />
<ClInclude Include="SamplerCache.h" />
<ClInclude Include="VideoBackend.h" />
</ItemGroup>

11
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -11,12 +11,10 @@
#include <vector>
#include "Common/Atomic.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MathUtil.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Common/Logging/LogManager.h"
@ -26,28 +24,21 @@
#include "VideoBackends/OGL/BoundingBox.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/main.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/RasterFont.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/SamplerCache.h"
#include "VideoBackends/OGL/StreamBuffer.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/TextureConverter.h"
#include "VideoBackends/OGL/VertexManager.h"
#include "VideoCommon/BPFunctions.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderGen.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"

12
Source/Core/VideoBackends/OGL/VertexManager.cpp
View File

@ -7,28 +7,20 @@
#include <string>
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "VideoBackends/OGL/main.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/StreamBuffer.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/VertexManager.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderGen.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
namespace OGL

3
Source/Core/VideoBackends/OGL/VertexManager.h
View File

@ -4,9 +4,6 @@
#pragma once
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/VertexManagerBase.h"

26
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -36,26 +36,21 @@ Make AA apply instantly during gameplay if possible
*/
#include <algorithm>
#include <cstdarg>
#include <memory>
#include <string>
#include <vector>
#include "Common/Atomic.h"
#include "Common/CommonPaths.h"
#include "Common/FileSearch.h"
#include "Common/Thread.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "VideoBackends/OGL/BoundingBox.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/PerfQuery.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/SamplerCache.h"
@ -68,10 +63,7 @@ Make AA apply instantly during gameplay if possible
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/GeometryShaderManager.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PixelEngine.h"
@ -79,7 +71,6 @@ Make AA apply instantly during gameplay if possible
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/VideoState.h"
namespace OGL
{
@ -139,14 +130,15 @@ static void InitBackendInfo()
g_Config.backend_info.AnaglyphShaders = GetShaders(ANAGLYPH_DIR DIR_SEP);
}
void VideoBackend::ShowConfig(void *_hParent)
void VideoBackend::ShowConfig(void* parent_handle)
{
if (!s_BackendInitialized)
if (!m_initialized)
InitBackendInfo();
Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl");
Host_ShowVideoConfig(parent_handle, GetDisplayName(), "gfx_opengl");
}
bool VideoBackend::Initialize(void *window_handle)
bool VideoBackend::Initialize(void* window_handle)
{
InitializeShared();
InitBackendInfo();
@ -167,7 +159,7 @@ bool VideoBackend::Initialize(void *window_handle)
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_INIT);
s_BackendInitialized = true;
m_initialized = true;
return true;
}
@ -206,7 +198,7 @@ void VideoBackend::Video_Prepare()
void VideoBackend::Shutdown()
{
s_BackendInitialized = false;
m_initialized = false;
// Do our OSD callbacks
OSD::DoCallbacks(OSD::OSD_SHUTDOWN);

9
Source/Core/VideoBackends/OGL/main.h
View File

@ -1,9 +0,0 @@
// Copyright 2008 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include <string>
#include "VideoCommon/MainBase.h"

3
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -86,6 +86,7 @@ bool VideoSoftware::Initialize(void *window_handle)
SWRenderer::Init();
DebugUtil::Init();
m_initialized = true;
return true;
}
@ -145,6 +146,8 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState)
void VideoSoftware::Shutdown()
{
m_initialized = false;
// TODO: should be in Video_Cleanup
SWRenderer::Shutdown();
DebugUtil::Shutdown();

13
Source/Core/VideoCommon/MainBase.cpp
View File

@ -2,19 +2,16 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/Event.h"
#include "Common/Flag.h"
#include "Core/ConfigManager.h"
#include "VideoCommon/AsyncRequests.h"
#include "VideoCommon/BoundingBox.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/FramebufferManagerBase.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VertexLoaderManager.h"
@ -22,8 +19,6 @@
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/VideoState.h"
bool s_BackendInitialized = false;
static Common::Flag s_FifoShuttingDown;
static volatile struct
@ -59,7 +54,7 @@ void VideoBackendHardware::Video_SetRendering(bool bEnabled)
// Run from the CPU thread (from VideoInterface.cpp)
void VideoBackendHardware::Video_BeginField(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight)
{
if (s_BackendInitialized && g_ActiveConfig.bUseXFB)
if (m_initialized && g_ActiveConfig.bUseXFB)
{
s_beginFieldArgs.xfbAddr = xfbAddr;
s_beginFieldArgs.fbWidth = fbWidth;
@ -71,7 +66,7 @@ void VideoBackendHardware::Video_BeginField(u32 xfbAddr, u32 fbWidth, u32 fbStri
// Run from the CPU thread (from VideoInterface.cpp)
void VideoBackendHardware::Video_EndField()
{
if (s_BackendInitialized && g_ActiveConfig.bUseXFB && g_renderer)
if (m_initialized && g_ActiveConfig.bUseXFB && g_renderer)
{
SyncGPU(SYNC_GPU_SWAP);

10
Source/Core/VideoCommon/MainBase.h
View File

@ -1,10 +0,0 @@
// Copyright 2010 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include "Common/CommonTypes.h"
#include "Common/Flag.h"
extern bool s_BackendInitialized;

4
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -17,7 +17,6 @@
#include <memory>
#include <string>
#include "Common/Atomic.h"
#include "Common/Event.h"
#include "Common/Profiler.h"
#include "Common/StringUtil.h"
@ -36,11 +35,8 @@
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/FPSCounter.h"
#include "VideoCommon/FramebufferManagerBase.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PostProcessing.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/Statistics.h"

2
Source/Core/VideoCommon/VertexManagerBase.cpp
View File

@ -10,13 +10,11 @@
#include "VideoCommon/Debugger.h"
#include "VideoCommon/GeometryShaderManager.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PerfQueryBase.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexManagerBase.h"

5
Source/Core/VideoCommon/VideoBackendBase.h
View File

@ -66,7 +66,7 @@ public:
virtual unsigned int PeekMessages() = 0;
virtual bool Initialize(void *window_handle) = 0;
virtual bool Initialize(void* window_handle) = 0;
virtual void Shutdown() = 0;
virtual void RunLoop(bool enable) = 0;
@ -115,6 +115,9 @@ public:
virtual void CheckInvalidState() = 0;
virtual void UpdateWantDeterminism(bool want) {}
protected:
bool m_initialized = false;
};
extern std::vector<VideoBackend*> g_available_video_backends;

1
Source/Core/VideoCommon/VideoCommon.vcxproj
View File

@ -104,7 +104,6 @@
<ClInclude Include="IndexGenerator.h" />
<ClInclude Include="LightingShaderGen.h" />
<ClInclude Include="LookUpTables.h" />
<ClInclude Include="MainBase.h" />
<ClInclude Include="NativeVertexFormat.h" />
<ClInclude Include="OnScreenDisplay.h" />
<ClInclude Include="OpcodeDecoding.h" />

3
Source/Core/VideoCommon/VideoCommon.vcxproj.filters
View File

@ -173,9 +173,6 @@
<ClInclude Include="FramebufferManagerBase.h">
<Filter>Base</Filter>
</ClInclude>
<ClInclude Include="MainBase.h">
<Filter>Base</Filter>
</ClInclude>
<ClInclude Include="PerfQueryBase.h">
<Filter>Base</Filter>
</ClInclude>