Mesa (master): nv50: fix build failure on m68k due to invalid struct alignment assumptions

Ilia Mirkin imirkin at kemper.freedesktop.org
Thu Jul 17 14:33:48 UTC 2014


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

Author: Thorsten Glaser <tg at debian.org>
Date:   Wed Oct 30 18:04:07 2013 +0100

nv50: fix build failure on m68k due to invalid struct alignment assumptions

Make alignment assumptions explicit by inserting correct padding with
unknown struct members.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: <mesa-stable at lists.freedesktop.org>

---

 src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c b/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c
index de923e4..1a520d2 100644
--- a/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c
+++ b/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c
@@ -67,10 +67,15 @@ struct iparm {
          uint32_t field_is_ref; // 04 // bit0: top, bit1: bottom
          uint8_t is_long_term; // 08
          uint8_t non_existing; // 09
+         uint8_t u0a; // 0a
+         uint8_t u0b; // 0b
          uint32_t frame_idx; // 0c
          uint32_t field_order_cnt[2]; // 10
          uint32_t mvidx; // 18
          uint8_t field_pic_flag; // 1c
+         uint8_t u1d; // 1d
+         uint8_t u1e; // 1e
+         uint8_t u1f; // 1f
          // 20
       } refs[0x10]; // 1e0
    } ipicparm; // 150




More information about the mesa-commit mailing list