Revisions to GLSL version override

- Reverted public function interface changes for C++.
- Added override member variable to TShader.
- Added accessor TShader::setOverrideVersion.
- Reverted changes to tests.
This commit is contained in:
Hai Nguyen
2022-01-01 19:02:14 -05:00
parent 356928a96b
commit 1f10dddac4
5 changed files with 28 additions and 22 deletions

View File

@@ -200,7 +200,7 @@ public:
if (!entryPointName.empty()) shader->setEntryPoint(entryPointName.c_str());
return shader->parse(
(resources ? resources : &glslang::DefaultTBuiltInResource),
defaultVersion, 0, isForwardCompatible, controls);
defaultVersion, isForwardCompatible, controls);
}
// Compiles and links the given source |code| of the given shader
@@ -635,7 +635,7 @@ public:
glslang::TShader::ForbidIncluder includer;
const bool success = shader.preprocess(
&glslang::DefaultTBuiltInResource, defaultVersion, defaultProfile,
forceVersionProfile, 0, isForwardCompatible, (EShMessages)(EShMsgOnlyPreprocessor | EShMsgCascadingErrors),
forceVersionProfile, isForwardCompatible, (EShMessages)(EShMsgOnlyPreprocessor | EShMsgCascadingErrors),
&ppShader, includer);
std::string log = shader.getInfoLog();