summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-06-15 12:03:10 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-06-15 12:20:49 -0700
commitfc0ef6451cfada274ecc3ea9ff5bca2bf143ab8a (patch)
tree2e0cbeb15aa4b308ff82e290af521b35f73fcb99 /main.cpp
parent2b36895f0c5bc569e15d63d2c865bda0b6928b36 (diff)
Minor bits of code rearranging
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/main.cpp b/main.cpp
index d32742b05b..9b77cc8aca 100644
--- a/main.cpp
+++ b/main.cpp
@@ -97,24 +97,25 @@ main(int argc, char **argv)
if (argc < 2)
usage_fail(argv[0]);
- memset(& state, 0, sizeof(state));
-
const unsigned len = strlen(argv[1]);
if (len < 6)
usage_fail(argv[0]);
const char *const ext = & argv[1][len - 5];
+ enum _mesa_glsl_parser_targets target;
if (strncmp(".vert", ext, 5) == 0)
- state.target = vertex_shader;
+ target = vertex_shader;
else if (strncmp(".geom", ext, 5) == 0)
- state.target = geometry_shader;
+ target = geometry_shader;
else if (strncmp(".frag", ext, 5) == 0)
- state.target = fragment_shader;
+ target = fragment_shader;
else
usage_fail(argv[0]);
shader = load_text_file(argv[1], & shader_len);
+ memset(& state, 0, sizeof(state));
+ state.target = target;
state.scanner = NULL;
state.translation_unit.make_empty();
state.symbols = new glsl_symbol_table;
@@ -131,6 +132,7 @@ main(int argc, char **argv)
ast_node *ast = exec_node_data(ast_node, n, link);
ast->print();
}
+ printf("\n\n");
if (!state.error && !state.translation_unit.is_empty())
_mesa_ast_to_hir(&instructions, &state);
@@ -154,8 +156,6 @@ main(int argc, char **argv)
}
/* Print out the resulting IR */
- printf("\n\n");
-
if (!state.error) {
_mesa_print_ir(&instructions, &state);
}