From 3230edbc0ed6b74995aa088d134005ee74df2738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 6 Jul 2021 13:15:12 -0400 Subject: [PATCH] ac/surface/tests: fix the ARM build Fixes: 8771d45a "ac/surface/tests: fix a random segfault in the modifier test" Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4655 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit c4644bf3e6f6de951d7adc64cb7c4809fb28dc24) --- .pick_status.json | 2 +- src/amd/common/ac_surface_modifier_test.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 82f1204b672..7703fe0308b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1390,7 +1390,7 @@ "description": "ac/surface/tests: fix the ARM build", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8771d45a741da6c6b764826a95f99e453e7afeb9" }, diff --git a/src/amd/common/ac_surface_modifier_test.c b/src/amd/common/ac_surface_modifier_test.c index 8c2f90fc8cc..91bdc8f5bba 100644 --- a/src/amd/common/ac_surface_modifier_test.c +++ b/src/amd/common/ac_surface_modifier_test.c @@ -42,10 +42,7 @@ struct test_entry { unsigned char hash[20]; /* u_vector requires power of two sizing */ - char padding[8]; -#ifdef PIPE_ARCH_X86 - char padding2[8]; -#endif + char padding[sizeof(void*) == 8 ? 8 : 16]; }; static uint64_t