Mesa (main): ac/surface/tests: fix the ARM build

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c4644bf3e6f6de951d7adc64cb7c4809fb28dc24
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4644bf3e6f6de951d7adc64cb7c4809fb28dc24

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Jul  6 13:15:12 2021 -0400

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 <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11754>

---

 src/amd/common/ac_surface_modifier_test.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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