Mesa (glsl2): glsl2: Remove incorrect assertion in the parser.
Ian Romanick
idr at kemper.freedesktop.org
Wed Jul 21 00:21:54 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 1036a7ebae2da03efd1b990037b6fd102d4cc5ca
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1036a7ebae2da03efd1b990037b6fd102d4cc5ca
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jul 17 22:42:35 2010 -0700
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.
---
src/glsl/glsl_parser.ypp | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index f85b419..6782255 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
More information about the mesa-commit
mailing list