Skip to content

G
glslang
Commit 674014bf by John Kessenich
Options

Fix: version 100 does not accept the 'es' profile

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20316 e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent 62b51a2b
Showing with 11 additions and 5 deletions
glslang/MachineIndependent/glslang.l
...@@ -743,8 +743,8 @@ void SetProfile(EProfile profile) ...@@ -743,8 +743,8 @@ void SetProfile(EProfile profile)
TParseContext& parseContext = *((TParseContext *)cpp->pC); TParseContext& parseContext = *((TParseContext *)cpp->pC);
if (profile == ENoProfile) { if (profile == ENoProfile) {
if (parseContext.version == 100 || parseContext.version == 300) { if (parseContext.version == 300) {
CPPErrorToInfoLog("versions 100 and 300 require specifying the es profile"); CPPErrorToInfoLog("version 300 requires specifying the 'es' profile");
parseContext.profile = ENoProfile; parseContext.profile = ENoProfile;
} else if (parseContext.version >= FirstProfileVersion) } else if (parseContext.version >= FirstProfileVersion)
parseContext.profile = ECoreProfile; parseContext.profile = ECoreProfile;
...@@ -752,13 +752,19 @@ void SetProfile(EProfile profile) ...@@ -752,13 +752,19 @@ void SetProfile(EProfile profile)
parseContext.profile = ENoProfile; parseContext.profile = ENoProfile;
} else { } else {
// a profile was provided... // a profile was provided...
if (parseContext.version == 100 || parseContext.version == 300) { if (parseContext.version < 150) {
CPPErrorToInfoLog("versions before 150 do not allow a profile token");
if (parseContext.version == 100)
parseContext.profile = EEsProfile;
else
parseContext.profile = ENoProfile;
} else if (parseContext.version == 300) {
if (profile != EEsProfile) if (profile != EEsProfile)
CPPErrorToInfoLog("versions 100 and 300 only support the es profile"); CPPErrorToInfoLog("only version 300 supports the es profile");
parseContext.profile = EEsProfile; parseContext.profile = EEsProfile;
} else { } else {
if (profile == EEsProfile) { if (profile == EEsProfile) {
CPPErrorToInfoLog("only versions 100 and 300 support the es profile"); CPPErrorToInfoLog("only version 300 supports the es profile");
if (parseContext.version >= FirstProfileVersion) if (parseContext.version >= FirstProfileVersion)
parseContext.profile = ECoreProfile; parseContext.profile = ECoreProfile;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment