nv50: fix build failure on m68k due to invalid struct alignment assumptions
authorThorsten Glaser <tg@debian.org>
Wed, 30 Oct 2013 17:04:07 +0000 (18:04 +0100)
committerIlia Mirkin <imirkin@alum.mit.edu>
Thu, 17 Jul 2014 14:31:30 +0000 (10:31 -0400)
Make alignment assumptions explicit by inserting correct padding with
unknown struct members.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: <mesa-stable@lists.freedesktop.org>
src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c

index de923e486b6f95a00fc4cdafb4496b81637369a9..1a520d2df0c819ebac3e6d330ba548283de8a267 100644 (file)
@@ -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