Commit b1e911ad by Nicolas Capens

Constant function parameters are not constant expressions.

Bug 19511934 Change-Id: I367a92ac0594d2bba91e26efe5c5af7dbe6f0d04 Reviewed-on: https://swiftshader-review.googlesource.com/2480Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 6ef6d2af
......@@ -900,16 +900,16 @@ bool TParseContext::nonInitErrorCheck(int line, TString& identifier, TPublicType
bool TParseContext::paramErrorCheck(int line, TQualifier qualifier, TQualifier paramQualifier, TType* type)
{
if (qualifier != EvqConstExpr && qualifier != EvqTemporary) {
if (qualifier != EvqConstReadOnly && qualifier != EvqTemporary) {
error(line, "qualifier not allowed on function parameter", getQualifierString(qualifier));
return true;
}
if (qualifier == EvqConstExpr && paramQualifier != EvqIn) {
if (qualifier == EvqConstReadOnly && paramQualifier != EvqIn) {
error(line, "qualifier not allowed with ", getQualifierString(qualifier), getQualifierString(paramQualifier));
return true;
}
if (qualifier == EvqConstExpr)
if (qualifier == EvqConstReadOnly)
type->setQualifier(EvqConstReadOnly);
else
type->setQualifier(paramQualifier);
......
......@@ -1499,7 +1499,7 @@ fully_specified_type
parameter_type_qualifier
: CONST_QUAL {
$$ = EvqConstExpr;
$$ = EvqConstReadOnly;
}
;
......
......@@ -3689,7 +3689,7 @@ yyreduce:
case 105:
{
(yyval.interm.qualifier) = EvqConstExpr;
(yyval.interm.qualifier) = EvqConstReadOnly;
}
break;
......
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