Skip to content

G
glslang
Commit 22f02d09 by John Kessenich
Options

EShTargetSpv: Fix #1235, spelling, in a backward compatible way.

parent 6c1c2766
Showing with 3 additions and 2 deletions
StandAlone/StandAlone.cpp
...@@ -855,7 +855,7 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits) ...@@ -855,7 +855,7 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
: glslang::EShSourceGlsl, : glslang::EShSourceGlsl,
compUnit.stage, glslang::EShClientVulkan, ClientInputSemanticsVersion); compUnit.stage, glslang::EShClientVulkan, ClientInputSemanticsVersion);
shader->setEnvClient(glslang::EShClientVulkan, VulkanClientVersion); shader->setEnvClient(glslang::EShClientVulkan, VulkanClientVersion);
shader->setEnvTarget(glslang::EshTargetSpv, TargetVersion); shader->setEnvTarget(glslang::EShTargetSpv, TargetVersion);
} else { } else {
shader->setEnvInput((Options & EOptionReadHlsl) ? glslang::EShSourceHlsl shader->setEnvInput((Options & EOptionReadHlsl) ? glslang::EShSourceHlsl
: glslang::EShSourceGlsl, : glslang::EShSourceGlsl,
......
glslang/Public/ShaderLang.h
...@@ -119,7 +119,8 @@ typedef enum { ...@@ -119,7 +119,8 @@ typedef enum {
typedef enum { typedef enum {
EShTargetNone, EShTargetNone,
EshTargetSpv, EShTargetSpv, // preferred spelling
EshTargetSpv = EShTargetSpv, // legacy spelling
} EShTargetLanguage; } EShTargetLanguage;
struct TInputLanguage { struct TInputLanguage {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment