Mesa (master): util/ralloc: fix ralloc alignment on Win64

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Apr 21 22:15:13 UTC 2020


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

Author: Jesse Natalie <jenatali at ntdev.microsoft.com>
Date:   Mon Jan 27 09:41:42 2020 -0800

util/ralloc: fix ralloc alignment on Win64

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4648>

---

 src/util/ralloc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/util/ralloc.c b/src/util/ralloc.c
index 0d20223d98f..f36f8bf3654 100644
--- a/src/util/ralloc.c
+++ b/src/util/ralloc.c
@@ -53,7 +53,11 @@ _CRTIMP int _vscprintf(const char *format, va_list argptr);
  */
 struct
 #ifdef _MSC_VER
+#if _WIN64
+__declspec(align(16))
+#else
  __declspec(align(8))
+#endif
 #elif defined(__LP64__)
  __attribute__((aligned(16)))
 #else



More information about the mesa-commit mailing list