From c648a124b20c5e37cf4041062333fc177a65f997 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 17 Jun 2010 19:51:48 -0700 Subject: [PATCH] Don't link shaders by default Add a command line option to trigger linking. This "fixes" all the failing test cases. Oops. --- main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 48aa51f..c7b8cf5 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; } -- 2.7.4