Module: Mesa Branch: main Commit: c905aeb4e496a7cb81a405d2118588b618d0ee93 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c905aeb4e496a7cb81a405d2118588b618d0ee93
Author: Chia-I Wu <[email protected]> Date: Tue Nov 7 13:12:30 2023 -0800 ac: be careful with stencil_offset override Check surf->has_stencil first to avoid trashing surf->u.gfx9.color. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26106> --- src/amd/common/ac_surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 93fda1d1209..ddba5c211a9 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -3093,8 +3093,9 @@ bool ac_surface_override_offset_stride(const struct radeon_info *info, struct ra surf->total_size = surf->surf_size = surf->u.gfx9.surf_slice_size * slices; } } + surf->u.gfx9.surf_offset = offset; - if (surf->u.gfx9.zs.stencil_offset) + if (surf->has_stencil) surf->u.gfx9.zs.stencil_offset += offset; } else { if (pitch) {
