From 818c89313e54bcf3de98b976c0da57c88a8588d2 Mon Sep 17 00:00:00 2001 From: magumagu Date: Wed, 16 Apr 2014 14:51:18 -0700 Subject: Video backends: unify xfregs/xfmem structures. Removes the duplicate swxfregs global variable/struct from the software backend in favor of the ones from VideoCommon. --- Source/Core/VideoCommon/RenderBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 8b42d1c23b..8702648b9a 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -504,7 +504,7 @@ void Renderer::RecordVideoMemory() { u32 *bpMem = (u32*)&bpmem; u32 cpMem[256]; - u32 *xfMem = (u32*)xfmem; + u32 *xfMem = (u32*)&xfmem; u32 *xfRegs = (u32*)&xfregs; memset(cpMem, 0, 256 * 4); -- cgit v1.2.3 From 8f5342c442c8e78784b4ea7002250781ba768767 Mon Sep 17 00:00:00 2001 From: magumagu Date: Wed, 16 Apr 2014 18:10:33 -0700 Subject: Video backend: merge global var xfmem into xfregs. There isn't really any reason to keep them separate. --- Source/Core/VideoCommon/RenderBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 8702648b9a..9e7719a1c9 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -504,8 +504,8 @@ void Renderer::RecordVideoMemory() { u32 *bpMem = (u32*)&bpmem; u32 cpMem[256]; - u32 *xfMem = (u32*)&xfmem; - u32 *xfRegs = (u32*)&xfregs; + u32 *xfMem = (u32*)&xfregs; + u32 *xfRegs = (u32*)&xfregs + 0x1000; memset(cpMem, 0, 256 * 4); FillCPMemoryArray(cpMem); -- cgit v1.2.3 From 1357277f40166683a3ac4eb9979010c3038d2db8 Mon Sep 17 00:00:00 2001 From: magumagu Date: Sun, 27 Apr 2014 11:59:04 -0700 Subject: Video backends: mass-replace "xfregs" with "xfmem". --- Source/Core/VideoCommon/RenderBase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 9e7719a1c9..c38c61f80a 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -504,13 +504,13 @@ void Renderer::RecordVideoMemory() { u32 *bpMem = (u32*)&bpmem; u32 cpMem[256]; - u32 *xfMem = (u32*)&xfregs; - u32 *xfRegs = (u32*)&xfregs + 0x1000; + u32 *xfMem = (u32*)&xfmem; + u32 *xfRegs = (u32*)&xfmem + 0x1000; memset(cpMem, 0, 256 * 4); FillCPMemoryArray(cpMem); - FifoRecorder::GetInstance().SetVideoMemory(bpMem, cpMem, xfMem, xfRegs, sizeof(XFRegisters) / 4); + FifoRecorder::GetInstance().SetVideoMemory(bpMem, cpMem, xfMem, xfRegs, sizeof(XFMemory) / 4); } void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc, float Gamma) -- cgit v1.2.3 From 6fbf6fad3b2dd1c3cc24a310641841da32de914e Mon Sep 17 00:00:00 2001 From: magumagu Date: Fri, 16 May 2014 18:40:06 -0700 Subject: VideoCommon: cleanup Renderer::RecordVideoMemory. --- Source/Core/VideoCommon/RenderBase.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'Source/Core/VideoCommon/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index c38c61f80a..744557b54c 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -502,15 +502,18 @@ void Renderer::CheckFifoRecording() void Renderer::RecordVideoMemory() { - u32 *bpMem = (u32*)&bpmem; - u32 cpMem[256]; - u32 *xfMem = (u32*)&xfmem; - u32 *xfRegs = (u32*)&xfmem + 0x1000; - - memset(cpMem, 0, 256 * 4); - FillCPMemoryArray(cpMem); - - FifoRecorder::GetInstance().SetVideoMemory(bpMem, cpMem, xfMem, xfRegs, sizeof(XFMemory) / 4); + u32 *bpmem_ptr = (u32*)&bpmem; + u32 cpmem[256]; + // The FIFO recording format splits XF memory into xfmem and xfregs; follow + // that split here. + u32 *xfmem_ptr = (u32*)&xfmem; + u32 *xfregs_ptr = (u32*)&xfmem + FifoDataFile::XF_MEM_SIZE; + u32 xfregs_size = sizeof(XFMemory) / 4 - FifoDataFile::XF_MEM_SIZE; + + memset(cpmem, 0, 256 * 4); + FillCPMemoryArray(cpmem); + + FifoRecorder::GetInstance().SetVideoMemory(bpmem_ptr, cpmem, xfmem_ptr, xfregs_ptr, xfregs_size); } void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc, float Gamma) -- cgit v1.2.3