summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
diff options
context:
space:
mode:
authormagumagu <magumagu9@gmail.com>2014-04-27 11:59:04 -0700
committermagumagu <magumagu9@gmail.com>2014-05-16 18:58:07 -0700
commit1357277f40166683a3ac4eb9979010c3038d2db8 (patch)
tree69895a9271115234210712d37ea5376dd196482f /Source/Core/VideoBackends/Software/SWVertexLoader.cpp
parent8f5342c442c8e78784b4ea7002250781ba768767 (diff)
Video backends: mass-replace "xfregs" with "xfmem".
Diffstat (limited to 'Source/Core/VideoBackends/Software/SWVertexLoader.cpp')
-rw-r--r--Source/Core/VideoBackends/Software/SWVertexLoader.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
index 490e5b54d3..f0cc09e3d2 100644
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -95,15 +95,15 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
// Reset vertex
// matrix index from xf regs or cp memory?
- if (xfregs.MatrixIndexA.PosNormalMtxIdx != MatrixIndexA.PosNormalMtxIdx ||
- xfregs.MatrixIndexA.Tex0MtxIdx != MatrixIndexA.Tex0MtxIdx ||
- xfregs.MatrixIndexA.Tex1MtxIdx != MatrixIndexA.Tex1MtxIdx ||
- xfregs.MatrixIndexA.Tex2MtxIdx != MatrixIndexA.Tex2MtxIdx ||
- xfregs.MatrixIndexA.Tex3MtxIdx != MatrixIndexA.Tex3MtxIdx ||
- xfregs.MatrixIndexB.Tex4MtxIdx != MatrixIndexB.Tex4MtxIdx ||
- xfregs.MatrixIndexB.Tex5MtxIdx != MatrixIndexB.Tex5MtxIdx ||
- xfregs.MatrixIndexB.Tex6MtxIdx != MatrixIndexB.Tex6MtxIdx ||
- xfregs.MatrixIndexB.Tex7MtxIdx != MatrixIndexB.Tex7MtxIdx)
+ if (xfmem.MatrixIndexA.PosNormalMtxIdx != MatrixIndexA.PosNormalMtxIdx ||
+ xfmem.MatrixIndexA.Tex0MtxIdx != MatrixIndexA.Tex0MtxIdx ||
+ xfmem.MatrixIndexA.Tex1MtxIdx != MatrixIndexA.Tex1MtxIdx ||
+ xfmem.MatrixIndexA.Tex2MtxIdx != MatrixIndexA.Tex2MtxIdx ||
+ xfmem.MatrixIndexA.Tex3MtxIdx != MatrixIndexA.Tex3MtxIdx ||
+ xfmem.MatrixIndexB.Tex4MtxIdx != MatrixIndexB.Tex4MtxIdx ||
+ xfmem.MatrixIndexB.Tex5MtxIdx != MatrixIndexB.Tex5MtxIdx ||
+ xfmem.MatrixIndexB.Tex6MtxIdx != MatrixIndexB.Tex6MtxIdx ||
+ xfmem.MatrixIndexB.Tex7MtxIdx != MatrixIndexB.Tex7MtxIdx)
{
WARN_LOG(VIDEO, "Matrix indices don't match");
@@ -114,15 +114,15 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
}
#if(1)
- m_Vertex.posMtx = xfregs.MatrixIndexA.PosNormalMtxIdx;
- m_Vertex.texMtx[0] = xfregs.MatrixIndexA.Tex0MtxIdx;
- m_Vertex.texMtx[1] = xfregs.MatrixIndexA.Tex1MtxIdx;
- m_Vertex.texMtx[2] = xfregs.MatrixIndexA.Tex2MtxIdx;
- m_Vertex.texMtx[3] = xfregs.MatrixIndexA.Tex3MtxIdx;
- m_Vertex.texMtx[4] = xfregs.MatrixIndexB.Tex4MtxIdx;
- m_Vertex.texMtx[5] = xfregs.MatrixIndexB.Tex5MtxIdx;
- m_Vertex.texMtx[6] = xfregs.MatrixIndexB.Tex6MtxIdx;
- m_Vertex.texMtx[7] = xfregs.MatrixIndexB.Tex7MtxIdx;
+ m_Vertex.posMtx = xfmem.MatrixIndexA.PosNormalMtxIdx;
+ m_Vertex.texMtx[0] = xfmem.MatrixIndexA.Tex0MtxIdx;
+ m_Vertex.texMtx[1] = xfmem.MatrixIndexA.Tex1MtxIdx;
+ m_Vertex.texMtx[2] = xfmem.MatrixIndexA.Tex2MtxIdx;
+ m_Vertex.texMtx[3] = xfmem.MatrixIndexA.Tex3MtxIdx;
+ m_Vertex.texMtx[4] = xfmem.MatrixIndexB.Tex4MtxIdx;
+ m_Vertex.texMtx[5] = xfmem.MatrixIndexB.Tex5MtxIdx;
+ m_Vertex.texMtx[6] = xfmem.MatrixIndexB.Tex6MtxIdx;
+ m_Vertex.texMtx[7] = xfmem.MatrixIndexB.Tex7MtxIdx;
#else
m_Vertex.posMtx = MatrixIndexA.PosNormalMtxIdx;
m_Vertex.texMtx[0] = MatrixIndexA.Tex0MtxIdx;
@@ -242,7 +242,7 @@ void SWVertexLoader::SetFormat(u8 attributeIndex, u8 primitiveType)
m_TexGenSpecialCase =
((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0
(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
- (xfregs.texMtxInfo[0].projection == XF_TEXPROJ_ST);
+ (xfmem.texMtxInfo[0].projection == XF_TEXPROJ_ST);
m_SetupUnit->Init(primitiveType);
}