From b2b925114f35c26958d1aaa40c893278da950815 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 25 Jun 2021 13:58:14 +0200 Subject: [PATCH] ac/surface: don't print stencil info if tex has no stencil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit color/zs are stored in a union so testing for zs.stencil_offset isn't the correct way to test for stencil. Fixes: 988f148db3c ("ac/surface: overlap color and Z/S fields using a union in gfx9_surf_layout") Reviewed-by: Marek Olšák Part-of: (cherry picked from commit c564841fae9ec42006b03ea5793b09e1dde9cc23) --- .pick_status.json | 2 +- src/amd/common/ac_surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d38a853573e..9c1c9e3d2e5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -130,7 +130,7 @@ "description": "ac/surface: don't print stencil info if tex has no stencil", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "988f148db3c9163246e1260750c8e6e43f6bbd5b" }, diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 5ef3a0d7e84..e7cb2ca2e36 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -2859,7 +2859,7 @@ void ac_surface_print_info(FILE *out, const struct radeon_info *info, surf->meta_offset, surf->meta_size, 1 << surf->meta_alignment_log2, surf->u.gfx9.color.display_dcc_pitch_max, surf->num_meta_levels); - if (surf->u.gfx9.zs.stencil_offset) + if (surf->has_stencil) fprintf(out, " Stencil: offset=%" PRIu64 ", swmode=%u, epitch=%u\n", surf->u.gfx9.zs.stencil_offset,