Permalink
Browse files

FifoPlayer: reduce XF_REGS_SIZE to what we know

This avoids out-of-bounds warnings when replaying FIFO captures.

The value of XF_REGS_SIZE is written into the DFF header and we only
read the min of XF_REGS_SIZE and the header value, so this change is
backward compatible and doesn't break forward compatibility for old
Dolphin versions either.
  • Loading branch information...
Tilka committed Oct 8, 2018
1 parent feaa466 commit 9c7136453d88a0c822454875d6bdd2756c516d68
Showing with 4 additions and 1 deletion.
  1. +3 −1 Source/Core/Core/FifoPlayer/FifoDataFile.h
  2. +1 −0 Source/Core/VideoCommon/XFMemory.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();
@@ -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;

0 comments on commit 9c71364

Please sign in to comment.