fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Stop passing a panfrost_device to pan_blend_get_internal_desc()

Browse source 
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-06 16:53:43 +01:00 • committed by Marge Bot
parent fbcc85108b
commit 0e7e22a808
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -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 =

9
src/panfrost/lib/pan_blend.c
View file

@ -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;

3
src/panfrost/lib/pan_blend.h
View file

@ -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,