From 22f02d09cc71cc02fabca5569a6e418ba27a1fe7 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Wed, 31 Jan 2018 17:53:24 -0700
Subject: [PATCH] EShTargetSpv: Fix #1235, spelling, in a backward compatible
way.
---
StandAlone/StandAlone.cpp | 2 +-
glslang/Public/ShaderLang.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 6b09c8bda..964c44e3a 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -855,7 +855,7 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
: glslang::EShSourceGlsl,
compUnit.stage, glslang::EShClientVulkan, ClientInputSemanticsVersion);
shader->setEnvClient(glslang::EShClientVulkan, VulkanClientVersion);
- shader->setEnvTarget(glslang::EshTargetSpv, TargetVersion);
+ shader->setEnvTarget(glslang::EShTargetSpv, TargetVersion);
} else {
shader->setEnvInput((Options & EOptionReadHlsl) ? glslang::EShSourceHlsl
: glslang::EShSourceGlsl,
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
index 17ec5bacd..484906e97 100644
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -119,7 +119,8 @@ typedef enum {
typedef enum {
EShTargetNone,
- EshTargetSpv,
+ EShTargetSpv, // preferred spelling
+ EshTargetSpv = EShTargetSpv, // legacy spelling
} EShTargetLanguage;
struct TInputLanguage {
--
GitLab