Mesa (master): glsl: Create AST data structures for switch statement and case label

Dan McCabe danm at kemper.freedesktop.org
Tue Nov 8 00:46:28 UTC 2011


Module: Mesa
Branch: master
Commit: 19daba54707b4ff90159850ce97faceba9c336c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19daba54707b4ff90159850ce97faceba9c336c0

Author: Dan McCabe <zen3d.linux at gmail.com>
Date:   Mon Nov  7 15:05:16 2011 -0800

glsl: Create AST data structures for switch statement and case label

Data structures for switch statement and case label are created that parallel
the structure of other AST data.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/ast.h |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/glsl/ast.h b/src/glsl/ast.h
index 9fe6c41..208ffc4 100644
--- a/src/glsl/ast.h
+++ b/src/glsl/ast.h
@@ -629,13 +629,19 @@ public:
 
 class ast_case_label : public ast_node {
 public:
+   ast_case_label(ast_expression *test_value);
+   virtual void print(void) const;
+
+   virtual ir_rvalue *hir(exec_list *instructions,
+			  struct _mesa_glsl_parse_state *state);
 
    /**
-    * An expression of NULL means 'default'.
+    * An test value of NULL means 'default'.
     */
-   ast_expression *expression;
+   ast_expression *test_value;
 };
 
+
 class ast_selection_statement : public ast_node {
 public:
    ast_selection_statement(ast_expression *condition,
@@ -654,8 +660,18 @@ public:
 
 class ast_switch_statement : public ast_node {
 public:
-   ast_expression *expression;
-   exec_list statements;
+   ast_switch_statement(ast_expression *test_expression,
+			ast_node *body);
+   virtual void print(void) const;
+
+   virtual ir_rvalue *hir(exec_list *instructions,
+			  struct _mesa_glsl_parse_state *state);
+
+   ast_expression *test_expression;
+   ast_node *body;
+
+protected:
+   void test_to_hir(exec_list *, struct _mesa_glsl_parse_state *);
 };
 
 class ast_iteration_statement : public ast_node {




More information about the mesa-commit mailing list