Permalink
Browse files

Merge pull request #7496 from stenzek/null-shader-cache

ShaderCache: Don't create or load shader cache with Null backend
  • Loading branch information...
Tilka committed Oct 14, 2018
2 parents 660fb3f + e3f475b commit b5d855caf7a2bed70edca0385922ffc6dfb5286f
Showing with 3 additions and 3 deletions.
  1. +2 −2 Source/Core/VideoBackends/Null/VertexManager.cpp
  2. +1 −1 Source/Core/VideoCommon/ShaderCache.cpp
@@ -13,13 +13,13 @@ namespace Null
class NullNativeVertexFormat : public NativeVertexFormat
{
public:
NullNativeVertexFormat() {}
NullNativeVertexFormat(const PortableVertexDeclaration& vtx_decl_) { vtx_decl = vtx_decl_; }
};
std::unique_ptr<NativeVertexFormat>
VertexManager::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl)
{
return std::make_unique<NullNativeVertexFormat>();
return std::make_unique<NullNativeVertexFormat>(vtx_decl);
}
VertexManager::VertexManager() : m_local_v_buffer(MAXVBUFFERSIZE), m_local_i_buffer(MAXIBUFFERSIZE)
@@ -35,7 +35,7 @@ bool ShaderCache::Initialize()
m_async_shader_compiler->ResizeWorkerThreads(g_ActiveConfig.GetShaderPrecompilerThreads());
// Load shader and UID caches.
if (g_ActiveConfig.bShaderCache)
if (g_ActiveConfig.bShaderCache && m_api_type != APIType::Nothing)
{
LoadShaderCaches();
LoadPipelineUIDCache();

0 comments on commit b5d855c

Please sign in to comment.