From a4db9a151294b8b34eea6db868fc15eea6cf2fac Mon Sep 17 00:00:00 2001 From: "Kristian H. Kristensen" Date: Thu, 21 Nov 2019 22:48:32 -0800 Subject: [PATCH] freedreno/a6xx: Set up multisample sysmem MRTs correctly We had an extra factor of num_samples in the stride. Reviewed-by: Eric Anholt Signed-off-by: Kristian H. Kristensen Tested-by: Marge Bot Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c index dfff3ecc512..e8f0992f310 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c @@ -112,7 +112,7 @@ emit_mrt(struct fd_ringbuffer *ring, struct pipe_framebuffer_state *pfb, offset = fd_resource_offset(rsc, psurf->u.tex.level, psurf->u.tex.first_layer); - stride = slice->pitch * rsc->layout.cpp * pfb->samples; + stride = slice->pitch * rsc->layout.cpp; swap = fd6_resource_swap(rsc, pformat); tile_mode = fd_resource_tile_mode(psurf->texture, psurf->u.tex.level); @@ -127,8 +127,6 @@ emit_mrt(struct fd_ringbuffer *ring, struct pipe_framebuffer_state *pfb, type = LAYER_CUBEMAP; else if (psurf->texture->target == PIPE_TEXTURE_3D) type = LAYER_3D; - - stride /= pfb->samples; } debug_assert((offset + slice->size0) <= fd_bo_size(rsc->bo)); -- 2.30.2