summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-06-17 19:51:48 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-06-17 19:51:48 -0700
commitc648a124b20c5e37cf4041062333fc177a65f997 (patch)
tree6ebf5b37f0c746cbd3d05470e874b9dd38d3a7c8
parent832dfa58b2070d60111bc1997aea86228f630e75 (diff)
Don't link shaders by default
Add a command line option to trigger linking. This "fixes" all the failing test cases. Oops.
-rw-r--r--main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index 48aa51f282..c7b8cf5a21 100644
--- a/main.cpp
+++ b/main.cpp
@@ -90,10 +90,12 @@ usage_fail(const char *name)
int dump_ast = 0;
int dump_lir = 0;
+int do_link = 0;
const struct option compiler_opts[] = {
{ "dump-ast", 0, &dump_ast, 1 },
{ "dump-lir", 0, &dump_lir, 1 },
+ { "link", 0, &do_link, 1 },
{ NULL, 0, NULL, 0 }
};
@@ -214,7 +216,7 @@ main(int argc, char **argv)
}
}
- if (status == EXIT_SUCCESS) {
+ if ((status == EXIT_SUCCESS) && do_link) {
link_shaders(&whole_program);
status = (whole_program.LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;
}