summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-07-17 22:42:35 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-07-20 17:13:17 -0700
commit1036a7ebae2da03efd1b990037b6fd102d4cc5ca (patch)
treec9b2677999b24da18b77a34fdb3e19c7ea6c0d7f /src
parent2b7c42b40ae459f7b290eb134d6dabd075aab9f0 (diff)
glsl2: Remove incorrect assertion in the parser.
This assertion is triggered by method calls (i.e. array.length()), where subexpressions[1] is an ast_function_call expression. Since the assertion itself had a comment saying it could be removed eventually, simply do so. Causes negative glslparser tests array-length-110.frag, array-length-args.frag, and array-length-unsized.frag to pass, but only because the length() method is not supported yet.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/glsl_parser.ypp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index f85b419271..6782255d45 100644
--- a/src/glsl/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
@@ -304,12 +304,6 @@ postfix_expression:
}
| function_call
{
- /* Function call parameters used to be stored as a circular list in
- * subexpressions[1]. They are now stored as a regular list in
- * expressions. This assertion validates that the old code was
- * correctly converted. It can eventually be removed.
- */
- assert($1->subexpressions[1] == NULL);
$$ = $1;
}
| postfix_expression '.' IDENTIFIER