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/VideoBackends/Software/SWmain.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index f41aba3a28..16ce1d059c 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -115,7 +115,8 @@ void VideoSoftware::DoState(PointerWrap& p) EfbInterface::DoState(p); OpcodeDecoder::DoState(p); Clipper::DoState(p); - p.Do(swxfregs); + p.Do(xfmem); + p.Do(xfregs); p.Do(bpmem); p.DoPOD(swstats); -- 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/VideoBackends/Software/SWmain.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 16ce1d059c..fbbef11704 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -115,7 +115,6 @@ void VideoSoftware::DoState(PointerWrap& p) EfbInterface::DoState(p); OpcodeDecoder::DoState(p); Clipper::DoState(p); - p.Do(xfmem); p.Do(xfregs); p.Do(bpmem); p.DoPOD(swstats); -- 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/VideoBackends/Software/SWmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index fbbef11704..318c69f365 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -115,7 +115,7 @@ void VideoSoftware::DoState(PointerWrap& p) EfbInterface::DoState(p); OpcodeDecoder::DoState(p); Clipper::DoState(p); - p.Do(xfregs); + p.Do(xfmem); p.Do(bpmem); p.DoPOD(swstats); -- cgit v1.2.3