mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
Remove code which got obsoleted by r5890.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5906 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
961bac32b3
commit
e8ed50854a
@ -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;
|
||||
|
||||
|
@ -80,5 +80,4 @@ namespace D3D
|
||||
void drawClearQuad(u32 Color,float z,IDirect3DPixelShader9 *PShader,IDirect3DVertexShader9 *Vshader);
|
||||
void SaveRenderStates();
|
||||
void RestoreRenderStates();
|
||||
bool DXCheck(std::wstring&);
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user