Skip to content

G
glslang
Unverified Commit 2f4a8dfd by John Kessenich Committed by GitHub
Options

Merge pull request #1788 from jeffbolznv/ifdef_fix

Add missing NV_EXTENSIONS ifdef
parents 9fe95274 71e5b132
Showing with 2 additions and 0 deletions
glslang/MachineIndependent/ParseHelper.cpp
...@@ -4988,8 +4988,10 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi ...@@ -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;
} }
......
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