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

vulkan: terminate shader compiler only once if inited 

fixes assert/crash when switching rendering api
This commit is contained in:
Flyinghead 2019-11-13 12:56:40 +01:00
parent 72c2ee1008
commit 9928af2506
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/rend/vulkan/compiler.cpp
View File

@ -128,13 +128,18 @@ static const TBuiltInResource DefaultTBuiltInResource = {
/* .generalConstantMatrixVectorIndexing = */ true,
}};
int ShaderCompiler::initCount;
void ShaderCompiler::Init()
{
verify(glslang::InitializeProcess());
if (initCount++ == 0)
verify(glslang::InitializeProcess());
}
void ShaderCompiler::Term()
{
glslang::FinalizeProcess();
if (--initCount == 0)
glslang::FinalizeProcess();
initCount = std::max(initCount, 0);
}
static EShLanguage translateShaderStage(vk::ShaderStageFlagBits stage)

2
core/rend/vulkan/compiler.h
View File

@ -26,4 +26,6 @@ public:
static void Init();
static void Term();
static vk::UniqueShaderModule Compile(vk::ShaderStageFlagBits shaderStage, std::string const& shaderText);
private:
static int initCount;
};