BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1569 from amdrexu/bugfix

Browse source 
Fix parser issue: redeclare gl_FragStencilRefARB is not supported
This commit is contained in:
John Kessenich 2018-11-12 09:01:35 -07:00 • committed by GitHub
commit d509a5eec6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Test/spv.shaderStencilExport.frag
View file

@ -2,6 +2,8 @@
#extension GL_ARB_shader_stencil_export: enable #extension GL_ARB_shader_stencil_export: enable
out int gl_FragStencilRefARB;
void main() void main()
{ {
gl_FragStencilRefARB = 100; gl_FragStencilRefARB = 100;

8
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -3872,6 +3872,8 @@ TSymbol* TParseContext::redeclareBuiltinVariable(const TSourceLoc& loc, const TS
identifier == "gl_BackSecondaryColor" || identifier == "gl_BackSecondaryColor" ||
identifier == "gl_SecondaryColor" || identifier == "gl_SecondaryColor" ||
(identifier == "gl_Color" && language == EShLangFragment) || (identifier == "gl_Color" && language == EShLangFragment) ||
(identifier == "gl_FragStencilRefARB" && (nonEsRedecls && version >= 140)
&& language == EShLangFragment) ||
#ifdef NV_EXTENSIONS #ifdef NV_EXTENSIONS
identifier == "gl_SampleMask" || identifier == "gl_SampleMask" ||
identifier == "gl_Layer" || identifier == "gl_Layer" ||
@ -3954,6 +3956,12 @@ TSymbol* TParseContext::redeclareBuiltinVariable(const TSourceLoc& loc, const TS
error(loc, "all redeclarations must use the same depth layout on", "redeclaration", symbol->getName().c_str()); error(loc, "all redeclarations must use the same depth layout on", "redeclaration", symbol->getName().c_str());
} }
} }
else if (identifier == "gl_FragStencilRefARB") {
if (qualifier.hasLayout())
error(loc, "cannot apply layout qualifier to", "redeclaration", symbol->getName().c_str());
if (qualifier.storage != EvqVaryingOut)
error(loc, "cannot change output storage qualification of", "redeclaration", symbol->getName().c_str());
}
#ifdef NV_EXTENSIONS #ifdef NV_EXTENSIONS
else if (identifier == "gl_SampleMask") { else if (identifier == "gl_SampleMask") {
if (!publicType.layoutOverrideCoverage) { if (!publicType.layoutOverrideCoverage) {