diff options
| author | NeoBrainX <NeoBrainX@googlemail.com> | 2010-07-18 15:19:24 +0000 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@googlemail.com> | 2010-07-18 15:19:24 +0000 |
| commit | e8ed50854afb19fa48fa3fe153d0d0df84d3635a (patch) | |
| tree | c1af72d4dbc45336ce401fd9c75a59c558401d35 /Source | |
| parent | 961bac32b32331bb1b4a09e01b87df5ca91e6638 (diff) | |
Remove code which got obsoleted by r5890.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5906 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 13 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.h | 6 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 9 |
4 files changed, 3 insertions, 26 deletions
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp index 9cc2dd19ba..f94ebc08f2 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp @@ -188,19 +188,6 @@ const int TS[6][2] = {D3DTSS_ALPHAARG2, D3DTA_DIFFUSE }, }; -bool DXCheck( std::wstring& msg ) -{ - HINSTANCE hDll = LoadLibrary(StringFromFormat( _T("d3dx9_%d.dll"), D3DX_SDK_VERSION).c_str()); - if( !hDll ) - { - msg = _T("Please make sure that you have the latest version of DirectX correctly installed."); - return false; - } else - msg = _T("DirectX is up to date and ready to be used!"); - FreeLibrary( hDll ); - return true; -} - static LPDIRECT3DPIXELSHADER9 ps_old = NULL; static LPDIRECT3DVERTEXSHADER9 vs_old = NULL; diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h index 4d535aa55d..fe7adb214d 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.h @@ -80,5 +80,4 @@ namespace D3D void drawClearQuad(u32 Color,float z,IDirect3DPixelShader9 *PShader,IDirect3DVertexShader9 *Vshader); void SaveRenderStates(); void RestoreRenderStates(); - bool DXCheck(std::wstring&); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.h b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.h index dba28f09bf..6fcf6e2261 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.h +++ b/Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.h @@ -36,12 +36,12 @@ class GFXConfigDialogDX : public wxDialog public: GFXConfigDialogDX(wxWindow *parent, wxWindowID id = 1, #ifdef DEBUGFAST - const wxString &title = wxT("DX (DEBUGFAST) Plugin Configuration"), + const wxString &title = wxT("DX9 (DEBUGFAST) Plugin Configuration"), #else #ifndef _DEBUG - const wxString &title = wxT("DX Plugin Configuration"), + const wxString &title = wxT("DX9 Plugin Configuration"), #else - const wxString &title = wxT("DX (DEBUG) Plugin Configuration"), + const wxString &title = wxT("DX9 (DEBUG) Plugin Configuration"), #endif #endif const wxPoint& pos = wxDefaultPosition, diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index 04a1730b1c..be548020be 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -245,15 +245,6 @@ void Initialize(void *init) return; } - std::wstring msg; - if( !D3D::DXCheck(msg) ) - { - msg.insert( 0, _T("Unable to initialize Direct3D. ") ); - msg.append( _T("\n\nHave a nice crash. :P") ); - MessageBox( (HWND)g_VideoInitialize.pWindowHandle, msg.c_str(), _T("Critical Error"), MB_ICONERROR|MB_OK ); - ShellExecute( NULL, NULL, _T("http://www.microsoft.com/downloads/details.aspx?FamilyID=2da43d38-db71-4c1b-bc6a-9b6652cd92a3"), NULL, NULL, SW_SHOWNORMAL ); - } - g_VideoInitialize.pPeekMessages = &Callback_PeekMessages; g_VideoInitialize.pUpdateFPSDisplay = &UpdateFPSDisplay; |
