Revert wrong indentation of some files. sorry for that one i was really convinced that i read that spaces must be used instead of tabs :)
This commit is contained in:
parent
08a6b8920b
commit
1de39a4a6e
|
@ -50,8 +50,8 @@
|
||||||
namespace DX9
|
namespace DX9
|
||||||
{
|
{
|
||||||
|
|
||||||
unsigned int VideoBackend::PeekMessages()
|
unsigned int VideoBackend::PeekMessages()
|
||||||
{
|
{
|
||||||
MSG msg;
|
MSG msg;
|
||||||
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
|
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
|
||||||
{
|
{
|
||||||
|
@ -61,27 +61,27 @@ namespace DX9
|
||||||
DispatchMessage(&msg);
|
DispatchMessage(&msg);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoBackend::UpdateFPSDisplay(const char *text)
|
void VideoBackend::UpdateFPSDisplay(const char *text)
|
||||||
{
|
{
|
||||||
TCHAR temp[512];
|
TCHAR temp[512];
|
||||||
swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs | DX9 | %hs"), scm_rev_str, text);
|
swprintf_s(temp, sizeof(temp)/sizeof(TCHAR), _T("%hs | DX9 | %hs"), scm_rev_str, text);
|
||||||
EmuWindow::SetWindowText(temp);
|
EmuWindow::SetWindowText(temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VideoBackend::GetName()
|
std::string VideoBackend::GetName()
|
||||||
{
|
{
|
||||||
return "DX9";
|
return "DX9";
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VideoBackend::GetDisplayName()
|
std::string VideoBackend::GetDisplayName()
|
||||||
{
|
{
|
||||||
return "Direct3D9 (deprecated)";
|
return "Direct3D9 (deprecated)";
|
||||||
}
|
}
|
||||||
|
|
||||||
void InitBackendInfo()
|
void InitBackendInfo()
|
||||||
{
|
{
|
||||||
DX9::D3D::Init();
|
DX9::D3D::Init();
|
||||||
D3DCAPS9 device_caps = DX9::D3D::GetCaps();
|
D3DCAPS9 device_caps = DX9::D3D::GetCaps();
|
||||||
const int shaderModel = ((device_caps.PixelShaderVersion >> 8) & 0xFF);
|
const int shaderModel = ((device_caps.PixelShaderVersion >> 8) & 0xFF);
|
||||||
|
@ -131,19 +131,19 @@ namespace DX9
|
||||||
g_Config.backend_info.PPShaders.clear();
|
g_Config.backend_info.PPShaders.clear();
|
||||||
|
|
||||||
DX9::D3D::Shutdown();
|
DX9::D3D::Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoBackend::ShowConfig(void* parent)
|
void VideoBackend::ShowConfig(void* parent)
|
||||||
{
|
{
|
||||||
#if defined(HAVE_WX) && HAVE_WX
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
InitBackendInfo();
|
InitBackendInfo();
|
||||||
VideoConfigDiag diag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9");
|
VideoConfigDiag diag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9");
|
||||||
diag.ShowModal();
|
diag.ShowModal();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool VideoBackend::Initialize(void *&window_handle)
|
bool VideoBackend::Initialize(void *&window_handle)
|
||||||
{
|
{
|
||||||
InitializeShared();
|
InitializeShared();
|
||||||
InitBackendInfo();
|
InitBackendInfo();
|
||||||
|
|
||||||
|
@ -173,10 +173,10 @@ namespace DX9
|
||||||
s_BackendInitialized = true;
|
s_BackendInitialized = true;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoBackend::Video_Prepare()
|
void VideoBackend::Video_Prepare()
|
||||||
{
|
{
|
||||||
// Better be safe...
|
// Better be safe...
|
||||||
s_efbAccessRequested = FALSE;
|
s_efbAccessRequested = FALSE;
|
||||||
s_FifoShuttingDown = FALSE;
|
s_FifoShuttingDown = FALSE;
|
||||||
|
@ -200,10 +200,10 @@ namespace DX9
|
||||||
DLCache::Init();
|
DLCache::Init();
|
||||||
// Notify the core that the video backend is ready
|
// Notify the core that the video backend is ready
|
||||||
Host_Message(WM_USER_CREATE);
|
Host_Message(WM_USER_CREATE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoBackend::Shutdown()
|
void VideoBackend::Shutdown()
|
||||||
{
|
{
|
||||||
s_BackendInitialized = false;
|
s_BackendInitialized = false;
|
||||||
|
|
||||||
// TODO: should be in Video_Cleanup
|
// TODO: should be in Video_Cleanup
|
||||||
|
@ -233,9 +233,9 @@ namespace DX9
|
||||||
g_texture_cache = NULL;
|
g_texture_cache = NULL;
|
||||||
}
|
}
|
||||||
D3D::Shutdown();
|
D3D::Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoBackend::Video_Cleanup() {
|
void VideoBackend::Video_Cleanup() {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue