diff options
| author | greg-lunarg <greg@lunarg.com> | 2021-03-17 15:46:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 15:46:13 -0600 |
| commit | f5929b8c5f83a2126fd146569e1200ff1d63338d (patch) | |
| tree | c4e9f907963d52d3e0a276769bb8457bb110e98a | |
| parent | b2e5b5c559e10a882ea72b5e4860d7f698fdf93c (diff) | |
| parent | 48f08c60e293d497bc395d18fe4ff1966be927d6 (diff) | |
| download | glslang-f5929b8c5f83a2126fd146569e1200ff1d63338d.tar.gz | |
Merge pull request #2577 from mbechard/master
fix variable capitalization. Don't initialize it in the struct's constructor
| -rw-r--r-- | glslang/MachineIndependent/ShaderLang.cpp | 3 | ||||
| -rw-r--r-- | glslang/Public/ShaderLang.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index 4b340eaa..e85196c4 100644 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -727,7 +727,7 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages break; case EShClientVulkan: spvVersion.vulkanGlsl = environment->input.dialectVersion; - spvVersion.vulkanRelaxed = environment->input.VulkanRulesRelaxed; + spvVersion.vulkanRelaxed = environment->input.vulkanRulesRelaxed; break; case EShClientOpenGL: spvVersion.openGl = environment->input.dialectVersion; @@ -1767,6 +1767,7 @@ TShader::TShader(EShLanguage s) // clear environment (avoid constructors in them for use in a C interface) environment.input.languageFamily = EShSourceNone; environment.input.dialect = EShClientNone; + environment.input.vulkanRulesRelaxed = false; environment.client.client = EShClientNone; environment.target.language = EShTargetNone; environment.target.hlslFunctionality1 = false; diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h index 74b9f3ee..14683daf 100644 --- a/glslang/Public/ShaderLang.h +++ b/glslang/Public/ShaderLang.h @@ -187,7 +187,7 @@ struct TInputLanguage { EShLanguage stage; // redundant information with other input, this one overrides when not EShSourceNone EShClient dialect; int dialectVersion; // version of client's language definition, not the client (when not EShClientNone) - bool VulkanRulesRelaxed = false; + bool vulkanRulesRelaxed; }; struct TClient { @@ -556,8 +556,8 @@ public: bool getEnvTargetHlslFunctionality1() const { return false; } #endif - void setEnvInputVulkanRulesRelaxed() { environment.input.VulkanRulesRelaxed = true; } - bool getEnvInputVulkanRulesRelaxed() const { return environment.input.VulkanRulesRelaxed; } + void setEnvInputVulkanRulesRelaxed() { environment.input.vulkanRulesRelaxed = true; } + bool getEnvInputVulkanRulesRelaxed() const { return environment.input.vulkanRulesRelaxed; } // Interface to #include handlers. // |