Merge pull request #7470 from Tilka/fifoplayer

FifoPlayer: reduce XF_REGS_SIZE to what we know
dolphin-emu · Oct 9, 2018 · 5b8e1e6 · 5b8e1e6
2 parents bb6aff1 + 9c71364
commit 5b8e1e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "VideoCommon/XFMemory.h"
 
 namespace File
 {
@@ -50,9 +51,10 @@ class FifoDataFile
     BP_MEM_SIZE = 256,
     CP_MEM_SIZE = 256,
     XF_MEM_SIZE = 4096,
-    XF_REGS_SIZE = 96,
+    XF_REGS_SIZE = 88,
     TEX_MEM_SIZE = 1024 * 1024,
   };
+  static_assert((XF_MEM_SIZE + XF_REGS_SIZE) * sizeof(u32) == sizeof(XFMemory));
 
   FifoDataFile();
   ~FifoDataFile();

diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h
@@ -288,6 +288,7 @@ struct XFMemory
   u32 unk9[8];                              // 0x1048 - 0x104f
   PostMtxInfo postMtxInfo[8];               // 0x1050 - 0x1057
 };
+static_assert(sizeof(XFMemory) == sizeof(u32) * 0x1058);
 
 extern XFMemory xfmem;