diff options
| author | degasus <wickmarkus@web.de> | 2014-07-08 22:37:58 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-07-11 16:10:20 +0200 |
| commit | 7e79806efcd5c5e41efea89fa385b480ac1882f5 (patch) | |
| tree | 57079ff88525dade11b2d1901357e221df6ddab7 /Source/Core/VideoBackends | |
| parent | 81ed17be53e7fed93147dc0d334a6c1d45f4e3c8 (diff) | |
remove unused globals
Also change globals into statics which are only used in one file
Diffstat (limited to 'Source/Core/VideoBackends')
4 files changed, 3 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index 5bfdf54389..e5e1ae2a83 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.cpp +++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp @@ -21,7 +21,7 @@ HINSTANCE hDXGIDll = nullptr; int dxgi_dll_ref = 0; typedef HRESULT (WINAPI* D3D11CREATEDEVICEANDSWAPCHAIN)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, CONST DXGI_SWAP_CHAIN_DESC*, IDXGISwapChain**, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**); -D3D11CREATEDEVICE PD3D11CreateDevice = nullptr; +static D3D11CREATEDEVICE PD3D11CreateDevice = nullptr; D3D11CREATEDEVICEANDSWAPCHAIN PD3D11CreateDeviceAndSwapChain = nullptr; HINSTANCE hD3DDll = nullptr; int d3d_dll_ref = 0; @@ -31,7 +31,7 @@ namespace D3D ID3D11Device* device = nullptr; ID3D11DeviceContext* context = nullptr; -IDXGISwapChain* swapchain = nullptr; +static IDXGISwapChain* swapchain = nullptr; D3D_FEATURE_LEVEL featlevel; D3DTexture2D* backbuf = nullptr; HWND hWnd; diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h index f700c7b2ce..dfea8d219a 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.h +++ b/Source/Core/VideoBackends/D3D/D3DBase.h @@ -40,7 +40,6 @@ void Close(); extern ID3D11Device* device; extern ID3D11DeviceContext* context; -extern IDXGISwapChain* swapchain; extern HWND hWnd; extern bool bFrameInProgress; @@ -77,7 +76,6 @@ void SetDebugObjectName(T resource, const char* name) typedef HRESULT (WINAPI *CREATEDXGIFACTORY)(REFIID, void**); extern CREATEDXGIFACTORY PCreateDXGIFactory; typedef HRESULT (WINAPI *D3D11CREATEDEVICE)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**); -extern D3D11CREATEDEVICE PD3D11CreateDevice; typedef HRESULT (WINAPI *D3DREFLECT)(LPCVOID, SIZE_T, REFIID, void**); extern D3DREFLECT PD3DReflect; diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index 3b80b9ddbf..4f4790ed72 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -44,7 +44,7 @@ static int et_UpdateInterrupts; static volatile bool interruptSet; static volatile bool interruptWaiting; -CPReg cpreg; // shared between gfx and emulator thread +static CPReg cpreg; // shared between gfx and emulator thread void DoState(PointerWrap &p) { diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h index e30eccfec5..6102921039 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h @@ -41,8 +41,6 @@ namespace SWCommandProcessor u32 breakpt; // 0x3c }; - extern CPReg cpreg; - // Init void Init(); void Shutdown(); |