Mesa (main): radeonsi: fix depth stencil multi sample texture blit

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 80974a5f1e4095b7ae9b4e705da5b33f283e35c2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80974a5f1e4095b7ae9b4e705da5b33f283e35c2

Author: Qiang Yu <yuq825 at gmail.com>
Date:   Fri Feb 11 15:01:25 2022 +0800

radeonsi: fix depth stencil multi sample texture blit

This causes the flushed_depth_texture is allocated without
multi sample. So the blit will cause VM fault.

cc: mesa-stable

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Signed-off-by: Qiang Yu <yuq825 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14990>

---

 src/gallium/drivers/radeonsi/si_texture.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 05e21f23c6a..943c6796b39 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -1717,6 +1717,7 @@ bool si_init_flushed_depth_texture(struct pipe_context *ctx, struct pipe_resourc
    resource.array_size = texture->array_size;
    resource.last_level = texture->last_level;
    resource.nr_samples = texture->nr_samples;
+   resource.nr_storage_samples = texture->nr_storage_samples;
    resource.usage = PIPE_USAGE_DEFAULT;
    resource.bind = texture->bind & ~PIPE_BIND_DEPTH_STENCIL;
    resource.flags = texture->flags | SI_RESOURCE_FLAG_FLUSHED_DEPTH;