summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoBackends/D3D/main.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index 294cd0aebc..3c3237402c 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -21,6 +21,7 @@
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoBackends/D3D/VideoBackend.h"
+#include "VideoCommon/ShaderCache.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
@@ -148,6 +149,7 @@ bool VideoBackend::Initialize(void* window_handle)
// internal interfaces
g_renderer = std::make_unique<Renderer>(backbuffer_width, backbuffer_height);
+ g_shader_cache = std::make_unique<VideoCommon::ShaderCache>();
g_texture_cache = std::make_unique<TextureCache>();
g_vertex_manager = std::make_unique<VertexManager>();
g_perf_query = std::make_unique<PerfQuery>();
@@ -155,7 +157,9 @@ bool VideoBackend::Initialize(void* window_handle)
VertexShaderCache::Init();
PixelShaderCache::Init();
GeometryShaderCache::Init();
- VertexShaderCache::WaitForBackgroundCompilesToComplete();
+ if (!g_shader_cache->Initialize())
+ return false;
+
D3D::InitUtils();
BBox::Init();
return true;
@@ -163,6 +167,7 @@ bool VideoBackend::Initialize(void* window_handle)
void VideoBackend::Shutdown()
{
+ g_shader_cache->Shutdown();
g_renderer->Shutdown();
D3D::ShutdownUtils();
@@ -174,6 +179,7 @@ void VideoBackend::Shutdown()
g_perf_query.reset();
g_vertex_manager.reset();
g_texture_cache.reset();
+ g_shader_cache.reset();
g_renderer.reset();
ShutdownShared();