diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-04-12 15:48:27 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-28 18:14:54 -0700 |
| commit | 32b305207cca7d8a084473f82f340e4b2fe188fa (patch) | |
| tree | 58d793725d955c1227c6369b1453ccc458e7bf6b | |
| parent | 451381c220f145ac27a177c955dde30a9618fd00 (diff) | |
ir_reader: Add initial loop support; doesn't yet support break/continue.
| -rw-r--r-- | ir_reader.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ir_reader.cpp b/ir_reader.cpp index ee849a8..f766270 100644 --- a/ir_reader.cpp +++ b/ir_reader.cpp @@ -36,6 +36,7 @@ static ir_instruction *read_instruction(_mesa_glsl_parse_state *, s_expression *); static ir_variable *read_declaration(_mesa_glsl_parse_state *, s_list *); static ir_if *read_if(_mesa_glsl_parse_state *, s_list *); +static ir_loop *read_loop(_mesa_glsl_parse_state *st, s_list *list); static ir_return *read_return(_mesa_glsl_parse_state *, s_list *); static ir_rvalue *read_rvalue(_mesa_glsl_parse_state *, s_expression *); @@ -184,6 +185,8 @@ read_instruction(_mesa_glsl_parse_state *st, s_expression *expr) inst = read_declaration(st, list); } else if (strcmp(tag->value(), "if") == 0) { inst = read_if(st, list); + } else if (strcmp(tag->value(), "loop") == 0) { + inst = read_loop(st, list); } else if (strcmp(tag->value(), "return") == 0) { inst = read_return(st, list); } else { @@ -296,6 +299,33 @@ read_if(_mesa_glsl_parse_state *st, s_list *list) } +static ir_loop * +read_loop(_mesa_glsl_parse_state *st, s_list *list) +{ + if (list->length() != 6) { + ir_read_error(list, "expected (loop <counter> <from> <to> <increment> " + "<body>)"); + return NULL; + } + + s_expression *count_expr = (s_expression*) list->subexpressions.head->next; + s_expression *from_expr = (s_expression*) count_expr->next; + s_expression *to_expr = (s_expression*) from_expr->next; + s_expression *inc_expr = (s_expression*) to_expr->next; + s_expression *body_expr = (s_expression*) inc_expr->next; + + // FINISHME: actually read the count/from/to fields. + + ir_loop *loop = new ir_loop; + read_instructions(st, &loop->body_instructions, body_expr); + if (st->error) { + delete loop; + loop = NULL; + } + return loop; +} + + static ir_return * read_return(_mesa_glsl_parse_state *st, s_list *list) { |