diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-03 00:09:39 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-03 00:09:39 +0100 |
| commit | f0e5811d9af52c17598cf2dd1ba994ee12cbe53e (patch) | |
| tree | 77fe33b7f11966a6bb2177fa040abc5381f74a84 /Source/Core/VideoBackends/D3D/main.cpp | |
| parent | 497a93d45f83b9be92bceb1b2a6df2b5a40f8495 (diff) | |
| parent | 01f99a04a2af61d70fc2a5eed14b2a0bf3c05696 (diff) | |
Merge pull request #3435 from lioncash/backend
VideoBackend: Get rid of a boolean global
Diffstat (limited to 'Source/Core/VideoBackends/D3D/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 35e4978c9b..1fc919c332 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -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) |
