OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Decouple tiler job and DCD emit

Browse Source 
We can share the "emit quad" logic, even though the DCDs differ.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15123>
This commit is contained in:
Alyssa Rosenzweig
2022-02-12 09:57:45 -05:00
committed by Marge Bot
parent a13d87c484
commit c9784c9512
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/panfrost/lib/pan_blitter.c
View File

@@ -1008,48 +1008,37 @@ pan_blit_emit_dcd(struct pan_pool *pool,
} }
} }
static struct panfrost_ptr static void *
pan_blit_emit_tiler_job(struct pan_pool *desc_pool, pan_blit_emit_tiler_job(struct pan_pool *pool,
struct pan_scoreboard *scoreboard, struct pan_scoreboard *scoreboard,
mali_ptr src_coords, mali_ptr dst_coords, mali_ptr tiler,
mali_ptr textures, mali_ptr samplers, struct panfrost_ptr *job)
mali_ptr vpd, mali_ptr rsd, mali_ptr tsd,
mali_ptr tiler)
{ {
struct panfrost_ptr job = *job = pan_pool_alloc_desc(pool, TILER_JOB);
pan_pool_alloc_desc(desc_pool, TILER_JOB);
pan_blit_emit_dcd(desc_pool, pan_section_pack(job->cpu, TILER_JOB, PRIMITIVE, cfg) {
src_coords, dst_coords, textures, samplers,
vpd, tsd, rsd,
pan_section_ptr(job.cpu, TILER_JOB, DRAW));
pan_section_pack(job.cpu, TILER_JOB, PRIMITIVE, cfg) {
cfg.draw_mode = MALI_DRAW_MODE_TRIANGLE_STRIP; cfg.draw_mode = MALI_DRAW_MODE_TRIANGLE_STRIP;
cfg.index_count = 4; cfg.index_count = 4;
cfg.job_task_split = 6; cfg.job_task_split = 6;
} }
pan_section_pack(job.cpu, TILER_JOB, PRIMITIVE_SIZE, cfg) { pan_section_pack(job->cpu, TILER_JOB, PRIMITIVE_SIZE, cfg) {
cfg.constant = 1.0f; cfg.constant = 1.0f;
} }
void *invoc = pan_section_ptr(job.cpu, void *invoc = pan_section_ptr(job->cpu, TILER_JOB, INVOCATION);
TILER_JOB, panfrost_pack_work_groups_compute(invoc, 1, 4, 1, 1, 1, 1, true, false);
INVOCATION);
panfrost_pack_work_groups_compute(invoc, 1, 4,
1, 1, 1, 1, true, false);
#if PAN_ARCH >= 6 #if PAN_ARCH >= 6
pan_section_pack(job.cpu, TILER_JOB, PADDING, cfg); pan_section_pack(job->cpu, TILER_JOB, PADDING, cfg);
pan_section_pack(job.cpu, TILER_JOB, TILER, cfg) { pan_section_pack(job->cpu, TILER_JOB, TILER, cfg) {
cfg.address = tiler; cfg.address = tiler;
} }
#endif #endif
panfrost_add_job(desc_pool, scoreboard, MALI_JOB_TYPE_TILER, panfrost_add_job(pool, scoreboard, MALI_JOB_TYPE_TILER,
false, false, 0, 0, &job, false); false, false, 0, 0, job, false);
return job; return pan_section_ptr(job->cpu, TILER_JOB, DRAW);
} }
#if PAN_ARCH >= 6 #if PAN_ARCH >= 6
@@ -1389,10 +1378,13 @@ GENX(pan_blit)(struct pan_blit_context *ctx,
pan_pool_upload_aligned(pool, src_rect, pan_pool_upload_aligned(pool, src_rect,
sizeof(src_rect), 64); sizeof(src_rect), 64);
return pan_blit_emit_tiler_job(pool, scoreboard, struct panfrost_ptr job = { 0 };
src_coords, ctx->position, void *dcd = pan_blit_emit_tiler_job(pool, scoreboard, tiler, &job);
ctx->textures, ctx->samplers,
ctx->vpd, ctx->rsd, tsd, tiler); pan_blit_emit_dcd(pool, src_coords, ctx->position, ctx->textures,
ctx->samplers, ctx->vpd, tsd, ctx->rsd, dcd);
return job;
} }
static uint32_t pan_blit_shader_key_hash(const void *key) static uint32_t pan_blit_shader_key_hash(const void *key)