From 0e7e22a808163937cc34374914b4c263f6398bbe Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 6 Dec 2023 16:53:43 +0100 Subject: [PATCH] panfrost: Stop passing a panfrost_device to pan_blend_get_internal_desc() Signed-off-by: Boris Brezillon Reviewed-by: Constantine Shablya Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 4 +--- src/panfrost/lib/pan_blend.c | 9 ++++----- src/panfrost/lib/pan_blend.h | 3 +-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 54d99b693f0..e801c8a5477 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -1131,15 +1131,13 @@ panfrost_upload_rt_conversion_sysval(struct panfrost_batch *batch, unsigned size_and_rt, struct sysval_uniform *uniform) { - struct panfrost_context *ctx = batch->ctx; - struct panfrost_device *dev = pan_device(ctx->base.screen); unsigned rt = size_and_rt & 0xF; unsigned size = size_and_rt >> 4; if (rt < batch->key.nr_cbufs && batch->key.cbufs[rt]) { enum pipe_format format = batch->key.cbufs[rt]->format; uniform->u[0] = - GENX(pan_blend_get_internal_desc)(dev, format, rt, size, false) >> 32; + GENX(pan_blend_get_internal_desc)(format, rt, size, false) >> 32; } else { pan_pack(&uniform->u[0], INTERNAL_CONVERSION, cfg) cfg.memory_format = diff --git a/src/panfrost/lib/pan_blend.c b/src/panfrost/lib/pan_blend.c index ce03044a56d..e375f2fec58 100644 --- a/src/panfrost/lib/pan_blend.c +++ b/src/panfrost/lib/pan_blend.c @@ -726,8 +726,7 @@ GENX(pan_blend_create_shader)(const struct panfrost_device *dev, #if PAN_ARCH >= 6 uint64_t -GENX(pan_blend_get_internal_desc)(const struct panfrost_device *dev, - enum pipe_format fmt, unsigned rt, +GENX(pan_blend_get_internal_desc)(enum pipe_format fmt, unsigned rt, unsigned force_size, bool dithered) { const struct util_format_description *desc = util_format_description(fmt); @@ -795,8 +794,8 @@ inline_rt_conversion(nir_builder *b, nir_intrinsic_instr *intr, void *data) struct rt_conversion_inputs *inputs = data; unsigned rt = nir_intrinsic_base(intr); unsigned size = nir_alu_type_get_type_size(nir_intrinsic_src_type(intr)); - uint64_t conversion = GENX(pan_blend_get_internal_desc)( - inputs->dev, inputs->formats[rt], rt, size, false); + uint64_t conversion = + GENX(pan_blend_get_internal_desc)(inputs->formats[rt], rt, size, false); b->cursor = nir_after_instr(&intr->instr); nir_def_rewrite_uses(&intr->def, nir_imm_int(b, conversion >> 32)); @@ -888,7 +887,7 @@ GENX(pan_blend_get_shader_locked)(const struct panfrost_device *dev, #if PAN_ARCH >= 6 inputs.blend.bifrost_blend_desc = - GENX(pan_blend_get_internal_desc)(dev, key.format, key.rt, 0, false); + GENX(pan_blend_get_internal_desc)(key.format, key.rt, 0, false); #endif struct pan_shader_info info; diff --git a/src/panfrost/lib/pan_blend.h b/src/panfrost/lib/pan_blend.h index 82f8fa24e3b..1d70245d411 100644 --- a/src/panfrost/lib/pan_blend.h +++ b/src/panfrost/lib/pan_blend.h @@ -155,8 +155,7 @@ nir_shader *GENX(pan_blend_create_shader)(const struct panfrost_device *dev, nir_alu_type src1_type, unsigned rt); #if PAN_ARCH >= 6 -uint64_t GENX(pan_blend_get_internal_desc)(const struct panfrost_device *dev, - enum pipe_format fmt, unsigned rt, +uint64_t GENX(pan_blend_get_internal_desc)(enum pipe_format fmt, unsigned rt, unsigned force_size, bool dithered); bool GENX(pan_inline_rt_conversion)(nir_shader *s,