From 7cec64fc42eba4587d2f3d73c03cb68ceb18dca4 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Thu, 22 Mar 2018 23:54:04 -0600
Subject: [PATCH] Non functional: add EshTargetClientVersion alias for
 EShTargetClientVersion.

Fixes #1304.
---
 StandAlone/StandAlone.cpp   | 4 ++--
 glslang/Public/ShaderLang.h | 8 +++++---
 gtests/TestFixture.h        | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 280ca7b..356e016 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -160,9 +160,9 @@ const char* variableName = nullptr;
 bool HlslEnable16BitTypes = false;
 std::vector<std::string> IncludeDirectoryList;
 int ClientInputSemanticsVersion = 100;                  // maps to, say, #define VULKAN 100
-glslang::EshTargetClientVersion VulkanClientVersion =
+glslang::EShTargetClientVersion VulkanClientVersion =
                           glslang::EShTargetVulkan_1_0; // would map to, say, Vulkan 1.0
-glslang::EshTargetClientVersion OpenGLClientVersion =
+glslang::EShTargetClientVersion OpenGLClientVersion =
                           glslang::EShTargetOpenGL_450; // doesn't influence anything yet, but maps to OpenGL 4.50
 glslang::EShTargetLanguageVersion TargetVersion =
                           glslang::EShTargetSpv_1_0;    // maps to, say, SPIR-V 1.0
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
index 6400ecf..ef6c074 100644
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -132,7 +132,9 @@ typedef enum {
     EShTargetVulkan_1_0 = (1 << 22),
     EShTargetVulkan_1_1 = (1 << 22) | (1 << 12),
     EShTargetOpenGL_450 = 450,
-} EshTargetClientVersion;
+} EShTargetClientVersion;
+
+typedef EShTargetClientVersion EshTargetClientVersion;
 
 typedef enum {
     EShTargetSpv_1_0 = (1 << 16),
@@ -148,7 +150,7 @@ struct TInputLanguage {
 
 struct TClient {
     EShClient client;
-    EshTargetClientVersion version;   // version of client itself (not the client's input dialect)
+    EShTargetClientVersion version;   // version of client itself (not the client's input dialect)
 };
 
 struct TTarget {
@@ -411,7 +413,7 @@ public:
         environment.input.dialect = client;
         environment.input.dialectVersion = version;
     }
-    void setEnvClient(EShClient client, EshTargetClientVersion version)
+    void setEnvClient(EShClient client, EShTargetClientVersion version)
     {
         environment.client.client = client;
         environment.client.version = version;
diff --git a/gtests/TestFixture.h b/gtests/TestFixture.h
index 5af96d9..0e984d4 100644
--- a/gtests/TestFixture.h
+++ b/gtests/TestFixture.h
@@ -197,7 +197,7 @@ public:
     GlslangResult compileAndLink(
             const std::string shaderName, const std::string& code,
             const std::string& entryPointName, EShMessages controls,
-            glslang::EshTargetClientVersion clientTargetVersion,
+            glslang::EShTargetClientVersion clientTargetVersion,
             bool flattenUniformArrays = false,
             EShTextureSamplerTransformMode texSampTransMode = EShTexSampTransKeep,
             bool disableOptimizer = true,
@@ -407,7 +407,7 @@ public:
                                  const std::string& testName,
                                  Source source,
                                  Semantics semantics,
-                                 glslang::EshTargetClientVersion clientTargetVersion,
+                                 glslang::EShTargetClientVersion clientTargetVersion,
                                  Target target,
                                  bool automap = true,
                                  const std::string& entryPointName="",
-- 
2.7.4