commit 34350be2cdb0cb769657d5ce82bc37d906eb3eb5
author Kenneth Graunke <kenneth@whitecape.org> Wed Apr 07 14:38:03 2010 -0700
committer Ian Romanick <ian.d.romanick@intel.com> Wed Apr 28 18:14:53 2010 -0700
tree 66620b003703ebdba2ed3f78de78977670709175
parent 1bfe1c3fdde39235ccbd8fc3da84a1603e919bc3

Add stub ir_reader and new 'i' mode for reading IR rather than GLSL.

glsl_parser_extras.cpp

diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 121104f..88889d5 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -39,6 +39,7 @@
 #include "ir_function_inlining.h"
 #include "ir_if_simplification.h"
 #include "ir_print_visitor.h"
+#include "ir_reader.h"
 
 const char *
 _mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target)
@@ -715,7 +716,7 @@
    exec_list instructions;
 
    if (argc < 3) {
-      printf("Usage: %s [v|g|f] <shader_file>\n", argv[0]);
+      printf("Usage: %s [v|g|f|i] <shader_file>\n", argv[0]);
       return EXIT_FAILURE;
    }
 
@@ -731,8 +732,11 @@
    case 'f':
       state.target = fragment_shader;
       break;
+   case 'i':
+      state.target = ir_shader;
+      break;
    default:
-      printf("Usage: %s [v|g|f] <shader_file>\n", argv[0]);
+      printf("Usage: %s [v|g|f|i] <shader_file>\n", argv[0]);
       return EXIT_FAILURE;
    }
 
@@ -746,16 +750,20 @@
    state.loop_or_switch_nesting = NULL;
    state.ARB_texture_rectangle_enable = true;
 
-   _mesa_glsl_lexer_ctor(& state, shader, shader_len);
-   _mesa_glsl_parse(& state);
-   _mesa_glsl_lexer_dtor(& state);
+   if (state.target != ir_shader) {
+      _mesa_glsl_lexer_ctor(& state, shader, shader_len);
+      _mesa_glsl_parse(& state);
+      _mesa_glsl_lexer_dtor(& state);
 
-   foreach (ptr, & state.translation_unit) {
-      ((ast_node *)ptr)->print();
+      foreach (ptr, & state.translation_unit) {
+	 ((ast_node *)ptr)->print();
+      }
+
+      _mesa_ast_to_hir(&instructions, &state);
+   } else {
+      _mesa_glsl_read_ir(&state, &instructions, shader);
    }
 
-   _mesa_ast_to_hir(&instructions, &state);
-
    /* Optimization passes */
    if (!state.error) {
       bool progress;