ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6456 from lioncash/video-static 

MainBase: Remove unused file-scope variables
This commit is contained in:
Léo Lam 2018-03-18 11:24:16 +01:00 committed by GitHub
parent 7465906a0f 13ed716419
commit 4b3542558a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/State.cpp
View File

@ -74,7 +74,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 93; // Last changed in PR 6389
static const u32 STATE_VERSION = 94; // Last changed in PR 6456
// Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list,

17
Source/Core/VideoCommon/MainBase.cpp
View File

@ -7,7 +7,6 @@
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "Common/Event.h"
#include "Common/Flag.h"
#include "Common/Logging/Log.h"
#include "Core/Host.h"
#include "VideoCommon/AsyncRequests.h"
@ -29,20 +28,9 @@
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/VideoState.h"
static Common::Flag s_FifoShuttingDown;
static volatile struct
{
u32 xfbAddr;
u32 fbWidth;
u32 fbStride;
u32 fbHeight;
} s_beginFieldArgs;
void VideoBackendBase::Video_ExitLoop()
{
Fifo::ExitGpuLoop();
s_FifoShuttingDown.Set();
}
// Run from the CPU thread (from VideoInterface.cpp)
@ -174,8 +162,6 @@ void VideoBackendBase::InitializeShared()
// do not initialize again for the config window
m_initialized = true;
s_FifoShuttingDown.Clear();
memset((void*)&s_beginFieldArgs, 0, sizeof(s_beginFieldArgs));
m_invalid = false;
frameCount = 0;
@ -221,9 +207,6 @@ void VideoBackendBase::DoState(PointerWrap& p)
VideoCommon_DoState(p);
p.DoMarker("VideoCommon");
p.Do(s_beginFieldArgs);
p.DoMarker("VideoBackendBase");
// Refresh state.
if (p.GetMode() == PointerWrap::MODE_READ)
{