fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/surface: don't print stencil info if tex has no stencil

Browse source 
color/zs are stored in a union so testing for zs.stencil_offset
isn't the correct way to test for stencil.

Fixes: 988f148db3 ("ac/surface: overlap color and Z/S fields using a union in gfx9_surf_layout")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
(cherry picked from commit c564841fae)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2021-06-25 13:58:14 +02:00 • committed by Eric Engestrom
parent 9b872e794f
commit b2b925114f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

2
src/amd/common/ac_surface.c
View file

@ -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,