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

panfrost: Get rid of unused panfrost_device arguments in pan_blitter.c

Browse Source 
Get rid of the panfrost_device in all helpers where it's currently
unused.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26698>
This commit is contained in:
Boris Brezillon
2023-12-07 12:23:35 +01:00
committed by Marge Bot
parent 3e85e3ce08
commit 95480bc2ab
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,7 @@ struct pan_blit_rsd_data {
#if PAN_ARCH >= 5 #if PAN_ARCH >= 5
static void static void
pan_blitter_emit_blend(const struct panfrost_device *dev, unsigned rt, pan_blitter_emit_blend(unsigned rt,
const struct pan_image_view *iview, const struct pan_image_view *iview,
const struct pan_blit_shader_data *blit_shader, const struct pan_blit_shader_data *blit_shader,
mali_ptr blend_shader, void *out) mali_ptr blend_shader, void *out)
@@ -199,8 +199,7 @@ pan_blitter_is_ms(struct pan_blitter_views *views)
#if PAN_ARCH >= 5 #if PAN_ARCH >= 5
static void static void
pan_blitter_emit_blends(const struct panfrost_device *dev, pan_blitter_emit_blends(const struct pan_blit_shader_data *blit_shader,
const struct pan_blit_shader_data *blit_shader,
struct pan_blitter_views *views, struct pan_blitter_views *views,
mali_ptr *blend_shaders, void *out) mali_ptr *blend_shaders, void *out)
{ {
@@ -209,15 +208,14 @@ pan_blitter_emit_blends(const struct panfrost_device *dev,
const struct pan_image_view *rt_view = views->dst_rts[i]; const struct pan_image_view *rt_view = views->dst_rts[i];
mali_ptr blend_shader = blend_shaders ? blend_shaders[i] : 0; mali_ptr blend_shader = blend_shaders ? blend_shaders[i] : 0;
pan_blitter_emit_blend(dev, i, rt_view, blit_shader, blend_shader, dest); pan_blitter_emit_blend(i, rt_view, blit_shader, blend_shader, dest);
} }
} }
#endif #endif
#if PAN_ARCH <= 7 #if PAN_ARCH <= 7
static void static void
pan_blitter_emit_rsd(const struct panfrost_device *dev, pan_blitter_emit_rsd(const struct pan_blit_shader_data *blit_shader,
const struct pan_blit_shader_data *blit_shader,
struct pan_blitter_views *views, mali_ptr *blend_shaders, struct pan_blitter_views *views, mali_ptr *blend_shaders,
void *out) void *out)
{ {
@@ -302,7 +300,7 @@ pan_blitter_emit_rsd(const struct panfrost_device *dev,
} }
#if PAN_ARCH >= 5 #if PAN_ARCH >= 5
pan_blitter_emit_blends(dev, blit_shader, views, blend_shaders, pan_blitter_emit_blends(blit_shader, views, blend_shaders,
out + pan_size(RENDERER_STATE)); out + pan_size(RENDERER_STATE));
#endif #endif
} }
@@ -772,7 +770,7 @@ pan_blitter_get_rsd(struct panfrost_device *dev,
blit_shader, blend_shaders); blit_shader, blend_shaders);
#endif #endif
pan_blitter_emit_rsd(dev, blit_shader, views, blend_shaders, rsd_ptr.cpu); pan_blitter_emit_rsd(blit_shader, views, blend_shaders, rsd_ptr.cpu);
rsd->address = rsd_ptr.gpu; rsd->address = rsd_ptr.gpu;
_mesa_hash_table_insert(dev->blitter.rsds.rsds, &rsd->key, rsd); _mesa_hash_table_insert(dev->blitter.rsds.rsds, &rsd->key, rsd);
@@ -1181,7 +1179,7 @@ pan_preload_emit_dcd(struct pan_pool *pool, struct pan_fb_info *fb, bool zs,
struct panfrost_ptr blend = pan_pool_alloc_desc_array(pool, bd_count, BLEND); struct panfrost_ptr blend = pan_pool_alloc_desc_array(pool, bd_count, BLEND);
if (!zs) { if (!zs) {
pan_blitter_emit_blends(pool->dev, blit_shader, &views, NULL, blend.cpu); pan_blitter_emit_blends(blit_shader, &views, NULL, blend.cpu);
} }
pan_pack(out, DRAW, cfg) { pan_pack(out, DRAW, cfg) {