diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2019-12-11 16:04:58 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-16 16:09:30 -0800 |
| commit | ed9c1f7f425801a3b067ba3a6c6132efe8f69ea8 (patch) | |
| tree | 6b3c6f146f0c598af8c56fe4b81e73275acb51e2 | |
| parent | 5d2d6442ff4d0bdbc17437c5ba2e5bdd4aaefb63 (diff) | |
amd/common: Fix tcCompatible degradation on Stoney.
addrlib sometimes returns smaller sizes for tcCompat as it does
not seem to take into account the depth+stencil matching config
gymnastics with tcCompat.
This fixes
dEQP-VK.pipeline.render_to_image.core.2d_array.huge.height.r8g8b8a8_unorm_d32_sfloat_s8_uint
CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3054>
(cherry picked from commit e197fb1c2fccf4719630d91a7c7f76308d88132b)
Conflicts resolved by Dylan Baker
Conflicts:
src/amd/common/ac_surface.c
| -rw-r--r-- | src/amd/common/ac_surface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 57f2bc46797..dc18ce93292 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -343,7 +343,7 @@ static int gfx6_compute_level(ADDR_HANDLE addrlib, AddrSurfInfoIn->flags.depth && surf_level->mode == RADEON_SURF_MODE_2D && level == 0) { - AddrHtileIn->flags.tcCompatible = AddrSurfInfoIn->flags.tcCompatible; + AddrHtileIn->flags.tcCompatible = AddrSurfInfoOut->tcCompatible; AddrHtileIn->pitch = AddrSurfInfoOut->pitch; AddrHtileIn->height = AddrSurfInfoOut->height; AddrHtileIn->numSlices = AddrSurfInfoOut->depth; |