From 7230058e8ac4a82ec4467478094324a6806f41a5 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 9 Nov 2021 14:36:51 -0800 Subject: [PATCH] freedreno/a6xx: Drop an unused tile_mode arg. I added this in ebaeddcbb3e9 ("freedreno/a6xx: Rewrite the format table format/swap helpers.") but it had already become unused through some bugfixing. Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 3 +-- src/gallium/drivers/freedreno/a6xx/fd6_format.c | 4 ++-- src/gallium/drivers/freedreno/a6xx/fd6_format.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c index b19e8158f70..1cd2af97ab9 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c @@ -111,7 +111,6 @@ setup_border_colors(struct fd_texture_stateobj *tex, enum pipe_format format = view->format; const struct util_format_description *desc = util_format_description(format); - const struct fd_resource *rsc = fd_resource(view->texture); e->rgb565 = 0; e->rgb5a1 = 0; @@ -121,7 +120,7 @@ setup_border_colors(struct fd_texture_stateobj *tex, unsigned char swiz[4]; - fd6_tex_swiz(format, rsc->layout.tile_mode, swiz, view->swizzle_r, view->swizzle_g, + fd6_tex_swiz(format, swiz, view->swizzle_r, view->swizzle_g, view->swizzle_b, view->swizzle_a); for (j = 0; j < 4; j++) { diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_format.c b/src/gallium/drivers/freedreno/a6xx/fd6_format.c index 5007001dc3a..b901e4dac18 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_format.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_format.c @@ -52,7 +52,7 @@ fd6_pipe2swiz(unsigned swiz) } void -fd6_tex_swiz(enum pipe_format format, enum a6xx_tile_mode tile_mode, unsigned char *swiz, unsigned swizzle_r, +fd6_tex_swiz(enum pipe_format format, unsigned char *swiz, unsigned swizzle_r, unsigned swizzle_g, unsigned swizzle_b, unsigned swizzle_a) { const struct util_format_description *desc = util_format_description(format); @@ -91,7 +91,7 @@ fd6_tex_const_0(struct pipe_resource *prsc, unsigned level, struct fd_resource *rsc = fd_resource(prsc); unsigned char swiz[4]; - fd6_tex_swiz(format, rsc->layout.tile_mode, swiz, swizzle_r, swizzle_g, swizzle_b, swizzle_a); + fd6_tex_swiz(format, swiz, swizzle_r, swizzle_g, swizzle_b, swizzle_a); return A6XX_TEX_CONST_0_FMT(fd6_texture_format(format, rsc->layout.tile_mode)) | A6XX_TEX_CONST_0_SAMPLES(fd_msaa_samples(prsc->nr_samples)) | diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_format.h b/src/gallium/drivers/freedreno/a6xx/fd6_format.h index 667ce729cd5..ee5e877f27e 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_format.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_format.h @@ -36,7 +36,7 @@ enum a6xx_tex_swiz fd6_pipe2swiz(unsigned swiz); -void fd6_tex_swiz(enum pipe_format format, enum a6xx_tile_mode tile_mode, unsigned char *swiz, +void fd6_tex_swiz(enum pipe_format format, unsigned char *swiz, unsigned swizzle_r, unsigned swizzle_g, unsigned swizzle_b, unsigned swizzle_a);