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

hk: fix unaligned copies

Browse source 
Fixes regression in Deus Ex: Human Revolution (DX11) via DXVK reported by James
Calligeros.

Pending CTS coverage: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5640

Only the alignment check here is load bearing but I clarified the logic while at
it.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34326>
This commit is contained in:
Alyssa Rosenzweig 2025-03-11 12:18:14 -04:00 • committed by Marge Bot
parent f7e706e325
commit b5367dd797
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/asahi/vulkan/hk_cmd_meta.c
View file

@ -1382,13 +1382,23 @@ hk_meta_resolve_rendering(struct hk_cmd_buffer *cmd,
static void
hk_cmd_copy(struct hk_cmd_buffer *cmd, uint64_t dst, uint64_t src, size_t size)
{
if (size / 16) {
libagx_copy_uint4(cmd, agx_1d(size / 16), AGX_BARRIER_ALL, dst, src);
/* Use vectorized copies for as much of the buffer as possible. This requires
* that dst, src, and size are all properly aligned. Failing to check for
* alignment on the buffers causes subtle and hard-to-debug issues!
*/
if (size >= 16 && (dst & 0xf) == 0 && (src & 0xf) == 0) {
unsigned uint4s = size / 16;
unsigned bytes = uint4s * 16;
libagx_copy_uint4(cmd, agx_1d(uint4s), AGX_BARRIER_ALL, dst, src);
dst += bytes;
src += bytes;
size -= bytes;
}
if (size % 16) {
libagx_copy_uchar(cmd, agx_1d(size % 16), AGX_BARRIER_ALL,
dst + (size & ~15), src + (size & ~15));
if (size) {
libagx_copy_uchar(cmd, agx_1d(size), AGX_BARRIER_ALL, dst, src);
}
}