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/OGL/Render.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/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 7e96c3dbbc..5b046f71dc 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1160,12 +1160,12 @@ void Renderer::SetViewport() int scissorYOff = bpmem.scissorOffset.y * 2; // TODO: ceil, floor or just cast to int? - float X = EFBToScaledXf(xfregs.viewport.xOrig - xfregs.viewport.wd - (float)scissorXOff); - float Y = EFBToScaledYf((float)EFB_HEIGHT - xfregs.viewport.yOrig + xfregs.viewport.ht + (float)scissorYOff); - float Width = EFBToScaledXf(2.0f * xfregs.viewport.wd); - float Height = EFBToScaledYf(-2.0f * xfregs.viewport.ht); - float GLNear = (xfregs.viewport.farZ - xfregs.viewport.zRange) / 16777216.0f; - float GLFar = xfregs.viewport.farZ / 16777216.0f; + float X = EFBToScaledXf(xfmem.viewport.xOrig - xfmem.viewport.wd - (float)scissorXOff); + float Y = EFBToScaledYf((float)EFB_HEIGHT - xfmem.viewport.yOrig + xfmem.viewport.ht + (float)scissorYOff); + float Width = EFBToScaledXf(2.0f * xfmem.viewport.wd); + float Height = EFBToScaledYf(-2.0f * xfmem.viewport.ht); + float GLNear = (xfmem.viewport.farZ - xfmem.viewport.zRange) / 16777216.0f; + float GLFar = xfmem.viewport.farZ / 16777216.0f; if (Width < 0) { X += Width; @@ -1807,7 +1807,7 @@ void Renderer::SetDitherMode() void Renderer::SetLineWidth() { - float fratio = xfregs.viewport.wd != 0 ? + float fratio = xfmem.viewport.wd != 0 ? ((float)Renderer::GetTargetWidth() / EFB_WIDTH) : 1.0f; if (bpmem.lineptwidth.linesize > 0) // scale by ratio of widths |