Mesa (master): freedreno/a6xx: Move the IBO pipe2tex down to where it's used.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: d6e307dcc541cc496439705f8ecf7b3639eaa2f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6e307dcc541cc496439705f8ecf7b3639eaa2f1

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec 18 10:51:24 2020 -0800

freedreno/a6xx: Move the IBO pipe2tex down to where it's used.

For the texture path, the pipe2tex happens in fd6_tex_const_0().

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8319>

---

 src/gallium/drivers/freedreno/a6xx/fd6_image.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_image.c b/src/gallium/drivers/freedreno/a6xx/fd6_image.c
index 1639a6bcf10..56824b3ff45 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_image.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_image.c
@@ -38,7 +38,6 @@
 struct fd6_image {
 	struct pipe_resource *prsc;
 	enum pipe_format pfmt;
-	enum a6xx_format fmt;
 	enum a6xx_tex_type type;
 	bool srgb;
 	uint32_t cpp;
@@ -67,7 +66,6 @@ static void translate_image(struct fd6_image *img, const struct pipe_image_view
 
 	img->prsc      = prsc;
 	img->pfmt      = format;
-	img->fmt       = fd6_pipe2tex(format);
 	img->type      = fd6_tex_type(prsc->target);
 	img->srgb      = util_format_is_srgb(format);
 	img->cpp       = rsc->layout.cpp;
@@ -145,7 +143,6 @@ static void translate_buf(struct fd6_image *img, const struct pipe_shader_buffer
 
 	img->prsc      = prsc;
 	img->pfmt      = format;
-	img->fmt       = fd6_pipe2tex(format);
 	img->type      = fd6_tex_type(prsc->target);
 	img->srgb      = util_format_is_srgb(format);
 	img->cpp       = rsc->layout.cpp;
@@ -249,7 +246,7 @@ static void emit_image_ssbo(struct fd_ringbuffer *ring, struct fd6_image *img)
 	enum a6xx_tile_mode tile_mode = fd_resource_tile_mode(img->prsc, img->level);
 	bool ubwc_enabled = fd_resource_ubwc_enabled(rsc, img->level);
 
-	OUT_RING(ring, A6XX_IBO_0_FMT(img->fmt) |
+	OUT_RING(ring, A6XX_IBO_0_FMT(fd6_pipe2tex(img->pfmt)) |
 		A6XX_IBO_0_TILE_MODE(tile_mode));
 	OUT_RING(ring, A6XX_IBO_1_WIDTH(img->width) |
 		A6XX_IBO_1_HEIGHT(img->height));