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

Call checkShaderStageForNVExtensions() from function updateExtensionBehavior()

Browse Source
This commit is contained in:
Sahil Parmar 2018-09-26 16:12:51 -07:00
parent 3ae0f58322
commit 251344f692
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glslang/MachineIndependent/Versions.cpp
View File

@ -742,6 +742,11 @@ void TParseVersions::updateExtensionBehavior(int line, const char* extension, co
return; return;
} }
#ifdef NV_EXTENSIONS
if (!checkShaderStageForNVExtensions(getCurrentLoc(), extension))
return;
#endif
// update the requested extension // update the requested extension
updateExtensionBehavior(extension, behavior); updateExtensionBehavior(extension, behavior);

5
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@ -874,11 +874,6 @@ int TPpContext::CPPextension(TPpToken* ppToken)
return token; return token;
} }
#ifdef NV_EXTENSIONS
if (!parseContext.checkShaderStageForNVExtensions(ppToken->loc, extensionName))
return token;
#endif
parseContext.updateExtensionBehavior(line, extensionName, ppToken->name); parseContext.updateExtensionBehavior(line, extensionName, ppToken->name);
parseContext.notifyExtensionDirective(line, extensionName, ppToken->name); parseContext.notifyExtensionDirective(line, extensionName, ppToken->name);