mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Non functional: add EshTargetClientVersion alias for EShTargetClientVersion.

Browse Source 
Fixes #1304.
This commit is contained in:
John Kessenich 2018-03-22 23:54:04 -06:00
parent 97e35420a6
commit 7cec64fc42
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
StandAlone/StandAlone.cpp
View File

@ -160,9 +160,9 @@ const char* variableName = nullptr;
bool HlslEnable16BitTypes = false; bool HlslEnable16BitTypes = false;
std::vector<std::string> IncludeDirectoryList; std::vector<std::string> IncludeDirectoryList;
int ClientInputSemanticsVersion = 100; // maps to, say, #define VULKAN 100 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::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::EShTargetOpenGL_450; // doesn't influence anything yet, but maps to OpenGL 4.50
glslang::EShTargetLanguageVersion TargetVersion = glslang::EShTargetLanguageVersion TargetVersion =
glslang::EShTargetSpv_1_0; // maps to, say, SPIR-V 1.0 glslang::EShTargetSpv_1_0; // maps to, say, SPIR-V 1.0

8
glslang/Public/ShaderLang.h
View File

@ -132,7 +132,9 @@ typedef enum {
EShTargetVulkan_1_0 = (1 << 22), EShTargetVulkan_1_0 = (1 << 22),
EShTargetVulkan_1_1 = (1 << 22) | (1 << 12), EShTargetVulkan_1_1 = (1 << 22) | (1 << 12),
EShTargetOpenGL_450 = 450, EShTargetOpenGL_450 = 450,
} EshTargetClientVersion; } EShTargetClientVersion;
typedef EShTargetClientVersion EshTargetClientVersion;
typedef enum { typedef enum {
EShTargetSpv_1_0 = (1 << 16), EShTargetSpv_1_0 = (1 << 16),
@ -148,7 +150,7 @@ struct TInputLanguage {
struct TClient { struct TClient {
EShClient client; 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 { struct TTarget {
@ -411,7 +413,7 @@ public:
environment.input.dialect = client; environment.input.dialect = client;
environment.input.dialectVersion = version; environment.input.dialectVersion = version;
} }
void setEnvClient(EShClient client, EshTargetClientVersion version) void setEnvClient(EShClient client, EShTargetClientVersion version)
{ {
environment.client.client = client; environment.client.client = client;
environment.client.version = version; environment.client.version = version;

4
gtests/TestFixture.h
View File

@ -197,7 +197,7 @@ public:
GlslangResult compileAndLink( GlslangResult compileAndLink(
const std::string shaderName, const std::string& code, const std::string shaderName, const std::string& code,
const std::string& entryPointName, EShMessages controls, const std::string& entryPointName, EShMessages controls,
glslang::EshTargetClientVersion clientTargetVersion, glslang::EShTargetClientVersion clientTargetVersion,
bool flattenUniformArrays = false, bool flattenUniformArrays = false,
EShTextureSamplerTransformMode texSampTransMode = EShTexSampTransKeep, EShTextureSamplerTransformMode texSampTransMode = EShTexSampTransKeep,
bool disableOptimizer = true, bool disableOptimizer = true,
@ -407,7 +407,7 @@ public:
const std::string& testName, const std::string& testName,
Source source, Source source,
Semantics semantics, Semantics semantics,
glslang::EshTargetClientVersion clientTargetVersion, glslang::EShTargetClientVersion clientTargetVersion,
Target target, Target target,
bool automap = true, bool automap = true,
const std::string& entryPointName="", const std::string& entryPointName="",