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

GLSL: Revert f6873f7 to fix #1764.

Browse Source
This commit is contained in:
John Kessenich 2019-06-08 04:30:46 -06:00
parent 60e774b22f
commit 92b5c9ee91
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Test/baseResults/310.comp.out
View File

@ -29,7 +29,6 @@ ERROR: 0:94: 'writeonly' : argument cannot drop memory qualifier when passed to
ERROR: 0:97: '' : memory qualifiers cannot be used on this type ERROR: 0:97: '' : memory qualifiers cannot be used on this type
ERROR: 0:98: '' : memory qualifiers cannot be used on this type ERROR: 0:98: '' : memory qualifiers cannot be used on this type
ERROR: 0:109: 'format' : image formats must match ERROR: 0:109: 'format' : image formats must match
ERROR: 0:110: 'restrict' : argument cannot drop memory qualifier when passed to formal parameter
ERROR: 0:110: 'format' : image formats must match ERROR: 0:110: 'format' : image formats must match
ERROR: 0:111: 'format' : image formats must match ERROR: 0:111: 'format' : image formats must match
ERROR: 0:114: 'image load-store format' : not supported with this profile: es ERROR: 0:114: 'image load-store format' : not supported with this profile: es
@ -87,7 +86,7 @@ WARNING: 0:238: '#define' : names containing consecutive underscores are reserve
ERROR: 0:244: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group ERROR: 0:244: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:245: 'gl_ViewIndex' : undeclared identifier ERROR: 0:245: 'gl_ViewIndex' : undeclared identifier
ERROR: 0:255: 'gl_ViewIndex' : undeclared identifier ERROR: 0:255: 'gl_ViewIndex' : undeclared identifier
ERROR: 86 compilation errors. No code generated. ERROR: 85 compilation errors. No code generated.
Shader version: 310 Shader version: 310

5
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -1165,8 +1165,9 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
error(arguments->getLoc(), message, "readonly", ""); error(arguments->getLoc(), message, "readonly", "");
if (argQualifier.writeonly && ! formalQualifier.writeonly) if (argQualifier.writeonly && ! formalQualifier.writeonly)
error(arguments->getLoc(), message, "writeonly", ""); error(arguments->getLoc(), message, "writeonly", "");
if (!builtIn && argQualifier.restrict && ! formalQualifier.restrict) // Don't check 'restrict', it is different than the rest:
error(arguments->getLoc(), message, "restrict", ""); // "...but only restrict can be taken away from a calling argument, by a formal parameter that
// lacks the restrict qualifier..."
} }
if (!builtIn && argQualifier.layoutFormat != formalQualifier.layoutFormat) { if (!builtIn && argQualifier.layoutFormat != formalQualifier.layoutFormat) {
// we have mismatched formats, which should only be allowed if writeonly // we have mismatched formats, which should only be allowed if writeonly