diff options
| author | Scott Mansell <phiren@gmail.com> | 2013-09-24 13:47:20 +1200 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2013-09-24 13:47:20 +1200 |
| commit | 0696fc93b2df07f42f32df6545822bad095189bc (patch) | |
| tree | 4b060fe8f6a8c746ba2b2e6a13d34c419ca82ad8 /Source/Core/VideoCommon/Src/MainBase.cpp | |
| parent | 41ab4a227557c3914c15a33c3d36a833bdd80ee6 (diff) | |
| parent | 440353a3a1b5b9bc0f990de8ac7e3a87df2d0987 (diff) | |
Merge branch 'fix-field-ordering'
Fixes 6387
Closes 6635
Diffstat (limited to 'Source/Core/VideoCommon/Src/MainBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/MainBase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index 1739683562..9df7ba9325 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -28,7 +28,6 @@ static volatile bool s_perf_query_requested; static volatile struct { u32 xfbAddr; - FieldType field; u32 fbWidth; u32 fbHeight; } s_beginFieldArgs; @@ -73,7 +72,7 @@ void VideoFifo_CheckSwapRequest() if (Common::AtomicLoadAcquire(s_swapRequested)) { EFBRectangle rc; - g_renderer->Swap(s_beginFieldArgs.xfbAddr, s_beginFieldArgs.field, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight,rc); + g_renderer->Swap(s_beginFieldArgs.xfbAddr, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight,rc); Common::AtomicStoreRelease(s_swapRequested, false); } } @@ -98,14 +97,13 @@ void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight) } // Run from the CPU thread (from VideoInterface.cpp) -void VideoBackendHardware::Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight) +void VideoBackendHardware::Video_BeginField(u32 xfbAddr, u32 fbWidth, u32 fbHeight) { if (s_BackendInitialized && g_ActiveConfig.bUseXFB) { if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread) VideoFifo_CheckSwapRequest(); s_beginFieldArgs.xfbAddr = xfbAddr; - s_beginFieldArgs.field = field; s_beginFieldArgs.fbWidth = fbWidth; s_beginFieldArgs.fbHeight = fbHeight; } |