summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorsten Glaser <tg@debian.org>2013-10-30 18:04:07 +0100
committerCarl Worth <cworth@cworth.org>2014-07-30 16:27:23 -0700
commit0e6d8ca573f4f8e84b4c1df5a45e806f3d273053 (patch)
treeefa28dc1f4e2774da68ae70b3aaedee3d629bd6a /src
parent1233cdd98d6eb5044a3d6d634b9b44473a7b7184 (diff)
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@alum.mit.edu> Cc: <mesa-stable@lists.freedesktop.org> (cherry picked from commit 3cfe6bc9cc369b29e5475b1bb0c60bbb37a6a1a2)
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c b/src/gallium/drivers/nouveau/nv50/nv84_video_bsp.c
index de923e486b6..1a520d2df0c 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