AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-14 22:01:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build: Fix more build warnings caused by PR #2038.

Browse Source 
Revisit fix for #2062 for consistency with this commit.
This commit is contained in:
John Kessenich 2020-01-27 10:16:25 -07:00
parent d5f2f7b93d
commit 19ec0d2ff9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/CInterface/glslang_c_interface.cpp
View File

@ -355,7 +355,7 @@ int glslang_shader_preprocess(glslang_shader_t* shader, const glslang_input_t* i
return shader->shader->preprocess( return shader->shader->preprocess(
/* No user-defined resources limit */ /* No user-defined resources limit */
&glslang::DefaultTBuiltInResource, i->default_version, c_shader_profile(i->default_profile), &glslang::DefaultTBuiltInResource, i->default_version, c_shader_profile(i->default_profile),
(bool)i->force_default_version_and_profile, (bool)i->forward_compatible, i->force_default_version_and_profile != 0, i->forward_compatible != 0,
(EShMessages)c_shader_messages(i->messages), &shader->preprocessedGLSL, Includer (EShMessages)c_shader_messages(i->messages), &shader->preprocessedGLSL, Includer
); );
} }
@ -367,7 +367,7 @@ int glslang_shader_parse(glslang_shader_t* shader, const glslang_input_t* input)
return shader->shader->parse( return shader->shader->parse(
/* No user-defined resource limits for now */ /* No user-defined resource limits for now */
&glslang::DefaultTBuiltInResource, input->default_version, (bool)input->forward_compatible, &glslang::DefaultTBuiltInResource, input->default_version, input->forward_compatible != 0,
(EShMessages)c_shader_messages(input->messages)); (EShMessages)c_shader_messages(input->messages));
} }

3
glslang/MachineIndependent/Intermediate.cpp
View File

@ -2774,8 +2774,9 @@ bool TIntermediate::postProcess(TIntermNode* root, EShLanguage /*language*/)
case EShTexSampTransUpgradeTextureRemoveSampler: case EShTexSampTransUpgradeTextureRemoveSampler:
performTextureUpgradeAndSamplerRemovalTransformation(root); performTextureUpgradeAndSamplerRemovalTransformation(root);
break; break;
default: case EShTexSampTransCount:
assert(0); assert(0);
break;
} }
#endif #endif

6
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -716,6 +716,9 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
case EShClientOpenGL: case EShClientOpenGL:
spvVersion.openGl = environment->input.dialectVersion; spvVersion.openGl = environment->input.dialectVersion;
break; break;
case EShClientCount:
assert(0);
break;
} }
switch (environment->input.languageFamily) { switch (environment->input.languageFamily) {
case EShSourceNone: case EShSourceNone:
@ -728,6 +731,9 @@ void TranslateEnvironment(const TEnvironment* environment, EShMessages& messages
source = EShSourceHlsl; source = EShSourceHlsl;
messages = static_cast<EShMessages>(messages | EShMsgReadHlsl); messages = static_cast<EShMessages>(messages | EShMsgReadHlsl);
break; break;
case EShClientCount:
assert(0);
break;
} }
} }