diff options
| author | Robert Foss <[email protected]> | 2020-01-15 01:14:16 +0100 |
|---|---|---|
| committer | Robert Foss <[email protected]> | 2020-01-15 22:30:17 +0000 |
| commit | 62adb6522b4b4f1f31e0828abbe496ecac5035e3 (patch) | |
| tree | 3252312e53d8dc8b056c9401787a89c454d238d4 /src/panfrost/midgard | |
| parent | c4daf2b485e18b7f5d87392244ce740e5c5a9fbd (diff) | |
panfrost: Prefix schedule_program to prevent collision
Currently the schedule_program implementation being used is picked
at compile time, which on the Android platform means that the
bifrost compiler & scheduler is used for all targets, including
midgard based hardware.
This commit disambiguates between the two schedule_program functions.
Signed-off-by: Robert Foss <[email protected]>
Reviewed-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/panfrost/midgard')
| -rw-r--r-- | src/panfrost/midgard/compiler.h | 2 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_compile.c | 2 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_schedule.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h index 936d2232bae..172b6d70f69 100644 --- a/src/panfrost/midgard/compiler.h +++ b/src/panfrost/midgard/compiler.h @@ -650,7 +650,7 @@ mir_has_arg(midgard_instruction *ins, unsigned arg) /* Scheduling */ -void schedule_program(compiler_context *ctx); +void midgard_schedule_program(compiler_context *ctx); void mir_ra(compiler_context *ctx); void mir_squeeze_index(compiler_context *ctx); diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 56a1138197a..291bb3b2709 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -2733,7 +2733,7 @@ midgard_compile_shader_nir(nir_shader *nir, midgard_program *program, bool is_bl mir_add_writeout_loops(ctx); /* Schedule! */ - schedule_program(ctx); + midgard_schedule_program(ctx); mir_ra(ctx); /* Now that all the bundles are scheduled and we can calculate block diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c index 05a0c74cbf8..2106d0d1ace 100644 --- a/src/panfrost/midgard/midgard_schedule.c +++ b/src/panfrost/midgard/midgard_schedule.c @@ -1148,7 +1148,7 @@ schedule_block(compiler_context *ctx, midgard_block *block) } void -schedule_program(compiler_context *ctx) +midgard_schedule_program(compiler_context *ctx) { midgard_promote_uniforms(ctx); |