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

Merge pull request #1788 from jeffbolznv/ifdef_fix

Browse Source 
Add missing NV_EXTENSIONS ifdef
This commit is contained in:
John Kessenich 2019-06-04 09:04:19 -06:00 committed by GitHub
commit 2f4a8dfd3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -4988,8 +4988,10 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
requireProfile(loc, ECoreProfile | ECompatibilityProfile, "fragment shader interlock layout qualifier"); requireProfile(loc, ECoreProfile | ECompatibilityProfile, "fragment shader interlock layout qualifier");
profileRequires(loc, ECoreProfile | ECompatibilityProfile, 450, nullptr, "fragment shader interlock layout qualifier"); profileRequires(loc, ECoreProfile | ECompatibilityProfile, 450, nullptr, "fragment shader interlock layout qualifier");
requireExtensions(loc, 1, &E_GL_ARB_fragment_shader_interlock, TQualifier::getInterlockOrderingString(order)); requireExtensions(loc, 1, &E_GL_ARB_fragment_shader_interlock, TQualifier::getInterlockOrderingString(order));
#ifdef NV_EXTENSIONS
if (order == EioShadingRateInterlockOrdered || order == EioShadingRateInterlockUnordered) if (order == EioShadingRateInterlockOrdered || order == EioShadingRateInterlockUnordered)
requireExtensions(loc, 1, &E_GL_NV_shading_rate_image, TQualifier::getInterlockOrderingString(order)); requireExtensions(loc, 1, &E_GL_NV_shading_rate_image, TQualifier::getInterlockOrderingString(order));
#endif
publicType.shaderQualifiers.interlockOrdering = order; publicType.shaderQualifiers.interlockOrdering = order;
return; return;
} }