From fa51d9903597a169e7ac7021a00b856f16b55f2e Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 7 Sep 2021 17:41:47 +0200 Subject: [PATCH] panvk: Get rid of panvk_emit_fragment_job() Now that we have a valid pan_fb_info attached to the state, we can use pan_emit_fragment_job() directly. Signed-off-by: Boris Brezillon Reviewed-by: Tomeu Vizoso Part-of: --- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 5 ++--- src/panfrost/vulkan/panvk_vX_cs.c | 20 -------------------- src/panfrost/vulkan/panvk_vX_cs.h | 5 ----- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index ed070a38646..38328e96f12 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -43,15 +43,14 @@ static void panvk_cmd_prepare_fragment_job(struct panvk_cmd_buffer *cmdbuf) { + const struct pan_fb_info *fbinfo = &cmdbuf->state.fb.info; assert(cmdbuf->state.bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS); struct panvk_batch *batch = cmdbuf->state.batch; struct panfrost_ptr job_ptr = pan_pool_alloc_desc(&cmdbuf->desc_pool.base, FRAGMENT_JOB); - panvk_per_arch(emit_fragment_job)(cmdbuf->state.framebuffer, - cmdbuf->state.batch->fb.desc.gpu, - job_ptr.cpu); + GENX(pan_emit_fragment_job)(fbinfo, batch->fb.desc.gpu, job_ptr.cpu), cmdbuf->state.batch->fragment_job = job_ptr.gpu; util_dynarray_append(&batch->jobs, void *, job_ptr.cpu); } diff --git a/src/panfrost/vulkan/panvk_vX_cs.c b/src/panfrost/vulkan/panvk_vX_cs.c index e3ae39ee3c4..b270ff6fb7e 100644 --- a/src/panfrost/vulkan/panvk_vX_cs.c +++ b/src/panfrost/vulkan/panvk_vX_cs.c @@ -518,26 +518,6 @@ panvk_per_arch(emit_tiler_job)(const struct panvk_pipeline *pipeline, #endif } -void -panvk_per_arch(emit_fragment_job)(const struct panvk_framebuffer *fb, - mali_ptr fbdesc, - void *job) -{ - pan_section_pack(job, FRAGMENT_JOB, HEADER, header) { - header.type = MALI_JOB_TYPE_FRAGMENT; - header.index = 1; - } - - pan_section_pack(job, FRAGMENT_JOB, PAYLOAD, payload) { - payload.bound_min_x = 0; - payload.bound_min_y = 0; - - payload.bound_max_x = (fb->width - 1) >> MALI_TILE_SHIFT; - payload.bound_max_y = (fb->height - 1) >> MALI_TILE_SHIFT; - payload.framebuffer = fbdesc; - } -} - void panvk_per_arch(emit_viewport)(const VkViewport *viewport, const VkRect2D *scissor, diff --git a/src/panfrost/vulkan/panvk_vX_cs.h b/src/panfrost/vulkan/panvk_vX_cs.h index 3158c767645..66c12c88279 100644 --- a/src/panfrost/vulkan/panvk_vX_cs.h +++ b/src/panfrost/vulkan/panvk_vX_cs.h @@ -84,11 +84,6 @@ panvk_per_arch(emit_tiler_job)(const struct panvk_pipeline *pipeline, const struct panvk_draw_info *draw, void *job); -void -panvk_per_arch(emit_fragment_job)(const struct panvk_framebuffer *fb, - mali_ptr fbdesc, - void *job); - void panvk_per_arch(emit_viewport)(const VkViewport *viewport, const VkRect2D *scissor,