diff options
| author | Rob Clark <[email protected]> | 2014-09-30 20:09:11 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2014-10-14 12:30:08 -0400 |
| commit | abe3b3d1e019212b8496b21335ca03c0dbee6bb2 (patch) | |
| tree | 7c03d6322e17d7e7b60e4a768c3d9d202a167dbe /src/gallium/drivers/freedreno/ir3 | |
| parent | d2c1d9693fbd30493d7f3fe9d33b85ae06611173 (diff) | |
freedreno: use tgsi_lowering
Now that the freedreno_lowering code is moved to tgsi_lowering, remove
our private copy and switch over to using the common version.
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno/ir3')
4 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c index 5e1832586e8..86239b45465 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c @@ -37,7 +37,6 @@ #include "tgsi/tgsi_dump.h" #include "freedreno_util.h" -#include "freedreno_lowering.h" #include "ir3_compiler.h" #include "instr-a3xx.h" diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler.c index 80676830dd7..1a5119c074f 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler.c @@ -32,6 +32,7 @@ #include "util/u_string.h" #include "util/u_memory.h" #include "util/u_inlines.h" +#include "tgsi/tgsi_lowering.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_ureg.h" #include "tgsi/tgsi_info.h" @@ -39,7 +40,6 @@ #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_scan.h" -#include "freedreno_lowering.h" #include "freedreno_util.h" #include "ir3_compiler.h" @@ -135,7 +135,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so, { unsigned ret; struct tgsi_shader_info *info = &ctx->info; - struct fd_lowering_config lconfig = { + struct tgsi_lowering_config lconfig = { .color_two_side = so->key.color_two_side, .lower_DST = true, .lower_XPD = true, @@ -167,7 +167,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so, break; } - ctx->tokens = fd_transform_lowering(&lconfig, tokens, &ctx->info); + ctx->tokens = tgsi_transform_lowering(&lconfig, tokens, &ctx->info); ctx->free_tokens = !!ctx->tokens; if (!ctx->tokens) { /* no lowering */ diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_old.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_old.c index 4267feb351f..33531568508 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_old.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_old.c @@ -32,6 +32,7 @@ #include "util/u_string.h" #include "util/u_memory.h" #include "util/u_inlines.h" +#include "tgsi/tgsi_lowering.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_ureg.h" #include "tgsi/tgsi_info.h" @@ -39,7 +40,6 @@ #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_scan.h" -#include "freedreno_lowering.h" #include "freedreno_util.h" #include "ir3_compiler.h" @@ -125,7 +125,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so, { unsigned ret, base = 0; struct tgsi_shader_info *info = &ctx->info; - struct fd_lowering_config lconfig = { + struct tgsi_lowering_config lconfig = { .color_two_side = so->key.color_two_side, .lower_DST = true, .lower_XPD = true, @@ -157,7 +157,7 @@ compile_init(struct ir3_compile_context *ctx, struct ir3_shader_variant *so, break; } - ctx->tokens = fd_transform_lowering(&lconfig, tokens, &ctx->info); + ctx->tokens = tgsi_transform_lowering(&lconfig, tokens, &ctx->info); ctx->free_tokens = !!ctx->tokens; if (!ctx->tokens) { /* no lowering */ diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.c b/src/gallium/drivers/freedreno/ir3/ir3_shader.c index 31e302b92c2..c77cec10cc7 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_shader.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.c @@ -35,7 +35,6 @@ #include "tgsi/tgsi_parse.h" #include "freedreno_context.h" -#include "freedreno_lowering.h" #include "freedreno_util.h" #include "ir3_shader.h" |