summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
diff options
context:
space:
mode:
authorRob Clark <[email protected]>2015-04-25 10:22:49 -0400
committerRob Clark <[email protected]>2015-06-21 07:53:25 -0400
commit0f6faa8ff317634ffb75e6040f2de2019dd80d13 (patch)
tree554b0ceb2eaf2d5e902b7bcdbabbbd781d227685 /src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
parent7273cb4e933f8be65fc73b9d8c69c76d1078cb14 (diff)
freedreno/ir3: remove tgsi f/e
Also remove ir3_flatten which was only used by tgsi f/e. Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno/ir3/ir3_cmdline.c')
-rw-r--r--src/gallium/drivers/freedreno/ir3/ir3_cmdline.c32
1 files changed, 2 insertions, 30 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
index e42afeaeb21..fb5c6513bcb 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
@@ -195,16 +195,6 @@ read_file(const char *filename, void **ptr, size_t *size)
return 0;
}
-static void reset_variant(struct ir3_shader_variant *v, const char *msg)
-{
- printf("; %s\n", msg);
- v->inputs_count = 0;
- v->outputs_count = 0;
- v->total_in = 0;
- v->has_samp = false;
- v->immediates_count = 0;
-}
-
static void print_usage(void)
{
printf("Usage: ir3_compiler [OPTIONS]... FILE\n");
@@ -231,7 +221,6 @@ int main(int argc, char **argv)
const char *info;
void *ptr;
size_t size;
- int use_nir = 0;
fd_mesa_debug |= FD_DBG_DISASM;
@@ -296,11 +285,6 @@ int main(int argc, char **argv)
n++;
continue;
}
- if (!strcmp(argv[n], "--nir")) {
- use_nir = true;
- n++;
- continue;
- }
if (!strcmp(argv[n], "--help")) {
print_usage();
@@ -341,20 +325,8 @@ int main(int argc, char **argv)
break;
}
- if (use_nir) {
- info = "NIR compiler";
- ret = ir3_compile_shader_nir(&v, toks, key);
- } else {
- info = "TGSI compiler";
- ret = ir3_compile_shader(&v, toks, key, true);
- }
-
- if (ret) {
- reset_variant(&v, "compiler failed, trying without copy propagation!");
- info = "compiler (no copy propagation)";
- ret = ir3_compile_shader(&v, toks, key, false);
- }
-
+ info = "NIR compiler";
+ ret = ir3_compile_shader_nir(&v, toks, key);
if (ret) {
fprintf(stderr, "compiler failed!\n");
return ret;