commit b1e911adcb5cafce13997878b9c0cf7921d694c5
author Nicolas Capens <capn@google.com> Thu Feb 26 13:16:00 2015 -0500
committer Nicolas Capens <capn@google.com> Mon Mar 02 20:53:02 2015 +0000
tree a078d07b153a8b862915e5f95ac2173d7bc9c592
parent 6ef6d2afff67ff7fb7af8c253838efcffa5d618d

Constant function parameters are not constant expressions.

Bug 19511934

Change-Id: I367a92ac0594d2bba91e26efe5c5af7dbe6f0d04
Reviewed-on: https://swiftshader-review.googlesource.com/2480
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/ParseHelper.cpp

diff --git a/src/OpenGL/compiler/ParseHelper.cpp b/src/OpenGL/compiler/ParseHelper.cpp
index 384bcb9..63e5795 100644
--- a/src/OpenGL/compiler/ParseHelper.cpp
+++ b/src/OpenGL/compiler/ParseHelper.cpp
@@ -900,16 +900,16 @@
 
 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);

src/OpenGL/compiler/glslang.y

diff --git a/src/OpenGL/compiler/glslang.y b/src/OpenGL/compiler/glslang.y
index bd8e752..e4fe60d 100644
--- a/src/OpenGL/compiler/glslang.y
+++ b/src/OpenGL/compiler/glslang.y
@@ -1499,7 +1499,7 @@
 
 parameter_type_qualifier
     : CONST_QUAL {
-        $$ = EvqConstExpr;
+        $$ = EvqConstReadOnly;
     }
     ;
 

src/OpenGL/compiler/glslang_tab.cpp

diff --git a/src/OpenGL/compiler/glslang_tab.cpp b/src/OpenGL/compiler/glslang_tab.cpp
index 6400be9..c79bf87 100644
--- a/src/OpenGL/compiler/glslang_tab.cpp
+++ b/src/OpenGL/compiler/glslang_tab.cpp
@@ -3689,7 +3689,7 @@
   case 105:
 
     {
-        (yyval.interm.qualifier) = EvqConstExpr;
+        (yyval.interm.qualifier) = EvqConstReadOnly;
     }
     break;