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

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com>
Date:   Mon Nov 20 09:17:01 2023 +0100

radeonsi: fix extra_md handling with fmask

Setting metadata on textures with fmask isn't allowed.

Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26774>

---

 src/gallium/drivers/radeonsi/si_texture.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_texture.c 
b/src/gallium/drivers/radeonsi/si_texture.c
index 084dca54d6a..1c27dd3bd7a 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -1372,7 +1372,8 @@ si_texture_create_with_modifier(struct pipe_screen 
*screen,
          last_plane->buffer.b.b.next = &tex->buffer.b.b;
          last_plane = tex;
       }
-      if (i == 0 && !is_zs && sscreen->debug_flags & DBG(EXTRA_METADATA))
+      if (i == 0 && !is_zs && tex->surface.fmask_size == 0 &&
+          sscreen->debug_flags & DBG(EXTRA_METADATA))
          si_set_tex_bo_metadata(sscreen, tex);
    }
 

Reply via email to