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

GSdx: Improved DX10/11 detection. Fixes crashes using the Configure... button mid-game. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3361 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-07-01 17:46:25 +00:00
parent 195c9e82b8
commit bba618beed
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/GSdx/GSDevice11.cpp
View File

@ -97,7 +97,16 @@ static void* GetDX11Proc( const char* methodname )
bool GSUtil::IsDirect3D11Available() bool GSUtil::IsDirect3D11Available()
{ {
if( !DXUTDelayLoadDXGI() ) return false; static bool m_CheckRun = false;
if (m_CheckRun) return m_D3D11Available;
m_CheckRun = true;
if( !DXUTDelayLoadDXGI() )
{
m_D3D11Available = false;
return false;
}
CComPtr<ID3D11Device> dev; CComPtr<ID3D11Device> dev;
CComPtr<ID3D11DeviceContext> ctx; CComPtr<ID3D11DeviceContext> ctx;
@ -107,14 +116,16 @@ bool GSUtil::IsDirect3D11Available()
D3D11_SDK_VERSION, &dev, &level, &ctx); D3D11_SDK_VERSION, &dev, &level, &ctx);
m_D3D11Available = !FAILED(hr); m_D3D11Available = !FAILED(hr);
m_HasD3D11Features = (level == D3D_FEATURE_LEVEL_11_0); m_HasD3D11Features = (level >= D3D_FEATURE_LEVEL_11_0);
UnloadDynamicLibraries();
return m_D3D11Available; return m_D3D11Available;
} }
bool GSUtil::HasD3D11Features() bool GSUtil::HasD3D11Features()
{ {
return m_D3D11Available && m_HasD3D11Features; return IsDirect3D11Available() && m_HasD3D11Features;
} }
void GSUtil::UnloadDynamicLibraries() void GSUtil::UnloadDynamicLibraries()