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/Clipper.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoBackends/Software/Clipper.cpp') diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp index e1081da142..f74a494622 100644 --- a/Source/Core/VideoBackends/Software/Clipper.cpp +++ b/Source/Core/VideoBackends/Software/Clipper.cpp @@ -67,8 +67,8 @@ namespace Clipper void SetViewOffset() { - m_ViewOffset[0] = swxfregs.viewport.xOrig - 342; - m_ViewOffset[1] = swxfregs.viewport.yOrig - 342; + m_ViewOffset[0] = xfregs.viewport.xOrig - 342; + m_ViewOffset[1] = xfregs.viewport.yOrig - 342; } @@ -430,9 +430,9 @@ namespace Clipper Vec3 &screen = vertex->screenPosition; float wInverse = 1.0f/projected.w; - screen.x = projected.x * wInverse * swxfregs.viewport.wd + m_ViewOffset[0]; - screen.y = projected.y * wInverse * swxfregs.viewport.ht + m_ViewOffset[1]; - screen.z = projected.z * wInverse * swxfregs.viewport.zRange + swxfregs.viewport.farZ; + screen.x = projected.x * wInverse * xfregs.viewport.wd + m_ViewOffset[0]; + screen.y = projected.y * wInverse * xfregs.viewport.ht + m_ViewOffset[1]; + screen.z = projected.z * wInverse * xfregs.viewport.zRange + xfregs.viewport.farZ; } } -- 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/Clipper.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoBackends/Software/Clipper.cpp') diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp index f74a494622..9cd41958c7 100644 --- a/Source/Core/VideoBackends/Software/Clipper.cpp +++ b/Source/Core/VideoBackends/Software/Clipper.cpp @@ -67,8 +67,8 @@ namespace Clipper void SetViewOffset() { - m_ViewOffset[0] = xfregs.viewport.xOrig - 342; - m_ViewOffset[1] = xfregs.viewport.yOrig - 342; + m_ViewOffset[0] = xfmem.viewport.xOrig - 342; + m_ViewOffset[1] = xfmem.viewport.yOrig - 342; } @@ -430,9 +430,9 @@ namespace Clipper Vec3 &screen = vertex->screenPosition; float wInverse = 1.0f/projected.w; - screen.x = projected.x * wInverse * xfregs.viewport.wd + m_ViewOffset[0]; - screen.y = projected.y * wInverse * xfregs.viewport.ht + m_ViewOffset[1]; - screen.z = projected.z * wInverse * xfregs.viewport.zRange + xfregs.viewport.farZ; + screen.x = projected.x * wInverse * xfmem.viewport.wd + m_ViewOffset[0]; + screen.y = projected.y * wInverse * xfmem.viewport.ht + m_ViewOffset[1]; + screen.z = projected.z * wInverse * xfmem.viewport.zRange + xfmem.viewport.farZ; } } -- cgit v1.2.3