projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 451381c)
ir_reader: Add initial loop support; doesn't yet support break/continue.
authorKenneth Graunke <kenneth@whitecape.org>
Mon, 12 Apr 2010 22:48:27 +0000 (15:48 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 29 Apr 2010 01:14:54 +0000 (18:14 -0700)
ir_reader.cpp patch | blob | history

diff --git a/ir_reader.cpp b/ir_reader.cpp
index ee849a8c91962287a0e02e07e2dc24dd37b5979a..f7662700a6c8775ebdb3502412753de18bf29f89 100644 (file)
--- 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)
 {