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

radv: Use stricter HW resolve swizzle compat check.

Browse source 
D and linear are both DISPLAY micro tiling according to ac_surface
but don't work together. This fixes an issue with GFX9+.

This fixes the SkQP WritePixelsNonTexture_Gpu test.

Fixes: 69ea473eeb ("amd/addrlib: update to the latest version")
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8665>
(cherry picked from commit 12ce72fcfc)

Conflicts:
	src/amd/vulkan/radv_meta_resolve.c
This commit is contained in:
Bas Nieuwenhuizen 2021-01-23 02:36:29 +01:00 • committed by Dylan Baker
parent fcb61d4b46
commit fd5c91e656
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -373,7 +373,7 @@
"description": "radv: Use stricter HW resolve swizzle compat check.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "69ea473eeb91b2c4db26402c3bc2ed5799d26605"
},

20
src/amd/vulkan/radv_meta_resolve.c
View file

@ -353,6 +353,19 @@ enum radv_resolve_method {
RESOLVE_FRAGMENT,
};
static bool image_hw_resolve_compat(const struct radv_device *device,
struct radv_image *src_image,
struct radv_image *dst_image)
{
if (device->physical_device->rad_info.chip_class >= GFX9) {
return dst_image->planes[0].surface.u.gfx9.surf.swizzle_mode ==
src_image->planes[0].surface.u.gfx9.surf.swizzle_mode;
} else {
return dst_image->planes[0].surface.micro_tile_mode ==
src_image->planes[0].surface.micro_tile_mode;
}
}
static void radv_pick_resolve_method_images(struct radv_device *device,
struct radv_image *src_image,
VkFormat src_format,
@ -376,8 +389,11 @@ static void radv_pick_resolve_method_images(struct radv_device *device,
if (radv_layout_dcc_compressed(device, dest_image, dest_image_layout,
dest_render_loop, queue_mask)) {
*method = RESOLVE_FRAGMENT;
} else if (dest_image->planes[0].surface.micro_tile_mode !=
src_image->planes[0].surface.micro_tile_mode) {
} else if (!image_hw_resolve_compat(device, src_image, dest_image)) {
/* The micro tile mode only needs to match for the HW
* resolve path which is the default path for non-DCC
* resolves.
*/
*method = RESOLVE_COMPUTE;
}