Skip to content

Commit 729f612

Browse files
committed
Fixed mapping of ShaderCompileSettings::Language to glslang::EShSource.
1 parent f5cea9f commit 729f612

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/vsg/utils/ShaderCompiler.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,14 @@ bool ShaderCompiler::compile(ShaderStages& shaders, const std::vector<std::strin
267267
// convert Vulkan version to glsLang equivalent
268268
glslang::EShTargetClientVersion targetClientVersion = static_cast<glslang::EShTargetClientVersion>((VK_API_VERSION_MAJOR(settings->vulkanVersion) << 22) | (VK_API_VERSION_MINOR(settings->vulkanVersion) << 12));
269269

270-
shader->setEnvInput(static_cast<glslang::EShSource>(settings->language), envStage, glslang::EShClientVulkan, settings->clientInputVersion);
270+
glslang::EShSource language = glslang::EShSourceNone;
271+
switch(settings->language)
272+
{
273+
case(ShaderCompileSettings::GLSL): language = glslang::EShSourceGlsl; break;
274+
case(ShaderCompileSettings::HLSL): language = glslang::EShSourceHlsl; break;
275+
}
276+
277+
shader->setEnvInput(language, envStage, glslang::EShClientVulkan, settings->clientInputVersion);
271278
shader->setEnvClient(glslang::EShClientVulkan, targetClientVersion);
272279
shader->setEnvTarget(glslang::EShTargetSpv, targetLanguageVersion);
273280

0 commit comments

Comments
 (0)