diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2014-05-17 10:40:57 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2014-05-17 10:40:57 +0200 |
| commit | 0fac17da336faf81a69842ad0b3641cdad692262 (patch) | |
| tree | 2bc0fa8c18c0ba4cbb9c6d3948bc665f71481916 /Source/Core/VideoBackends/Software/SWVertexLoader.cpp | |
| parent | d0de0c1222e87435f9b09ff80732a79e74b92ffa (diff) | |
| parent | 6fbf6fad3b2dd1c3cc24a310641841da32de914e (diff) | |
Merge pull request #269 from magumagu/swbackend-xfregisters
SW backend: use VideoCommon XFRegisters struct.
Diffstat (limited to 'Source/Core/VideoBackends/Software/SWVertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index 63d96dcd2c..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 (swxfregs.MatrixIndexA.PosNormalMtxIdx != MatrixIndexA.PosNormalMtxIdx || - swxfregs.MatrixIndexA.Tex0MtxIdx != MatrixIndexA.Tex0MtxIdx || - swxfregs.MatrixIndexA.Tex1MtxIdx != MatrixIndexA.Tex1MtxIdx || - swxfregs.MatrixIndexA.Tex2MtxIdx != MatrixIndexA.Tex2MtxIdx || - swxfregs.MatrixIndexA.Tex3MtxIdx != MatrixIndexA.Tex3MtxIdx || - swxfregs.MatrixIndexB.Tex4MtxIdx != MatrixIndexB.Tex4MtxIdx || - swxfregs.MatrixIndexB.Tex5MtxIdx != MatrixIndexB.Tex5MtxIdx || - swxfregs.MatrixIndexB.Tex6MtxIdx != MatrixIndexB.Tex6MtxIdx || - swxfregs.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 = swxfregs.MatrixIndexA.PosNormalMtxIdx; - m_Vertex.texMtx[0] = swxfregs.MatrixIndexA.Tex0MtxIdx; - m_Vertex.texMtx[1] = swxfregs.MatrixIndexA.Tex1MtxIdx; - m_Vertex.texMtx[2] = swxfregs.MatrixIndexA.Tex2MtxIdx; - m_Vertex.texMtx[3] = swxfregs.MatrixIndexA.Tex3MtxIdx; - m_Vertex.texMtx[4] = swxfregs.MatrixIndexB.Tex4MtxIdx; - m_Vertex.texMtx[5] = swxfregs.MatrixIndexB.Tex5MtxIdx; - m_Vertex.texMtx[6] = swxfregs.MatrixIndexB.Tex6MtxIdx; - m_Vertex.texMtx[7] = swxfregs.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) && - (swxfregs.texMtxInfo[0].projection == XF_TEXPROJ_ST); + (xfmem.texMtxInfo[0].projection == XF_TEXPROJ_ST); m_SetupUnit->Init(primitiveType); } |