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

GSDX: Simplified and improved (for my purposes) the D3D11 checks a little. Necessary for something I'm working on, hopefully doesn't break GSDX for anyone (this code took a lot of revisions initially as I recall). 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5357 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
sudonim1@gmail.com 2012-08-06 01:56:25 +00:00
parent 53396b52c0
commit cd05504851
5 changed files with 34 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/GSdx/GS.cpp
View File

@ -352,8 +352,7 @@ EXPORT_C_(int) GSopen2(void** dsp, uint32 flags)
if(flags & 4)
{
#ifdef _WINDOWS
D3D_FEATURE_LEVEL level;
int best_sw_renderer = GSUtil::CheckDirect3D11Level(level) && level >= D3D_FEATURE_LEVEL_10_0 ? 4 : 1; // dx11 / dx9 sw
int best_sw_renderer = GSUtil::CheckDirect3D11Level() >= D3D_FEATURE_LEVEL_10_0 ? 4 : 1; // dx11 / dx9 sw
switch(renderer){
// Use alternative renderer (SW if currently using HW renderer, and vice versa, keeping the same DX level)
@ -397,9 +396,7 @@ EXPORT_C_(int) GSopen(void** dsp, char* title, int mt)
#ifdef _WINDOWS
D3D_FEATURE_LEVEL level;
renderer = GSUtil::CheckDirect3D11Level(level) && level >= D3D_FEATURE_LEVEL_10_0 ? 4 : 1; // dx11 / dx9 sw
renderer = GSUtil::CheckDirect3D11Level() >= D3D_FEATURE_LEVEL_10_0 ? 4 : 1; // dx11 / dx9 sw
#endif

1
plugins/GSdx/GSDevice11.cpp
View File

@ -37,7 +37,6 @@ GSDevice11::GSDevice11()
GSDevice11::~GSDevice11()
{
GSUtil::UnloadDynamicLibraries();
}
bool GSDevice11::Create(GSWnd* wnd)

4
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -73,9 +73,7 @@ void GSSettingsDlg::OnInit()
}
}
D3D_FEATURE_LEVEL level;
GSUtil::CheckDirect3D11Level(level);
D3D_FEATURE_LEVEL level = GSUtil::CheckDirect3D11Level();
vector<GSSetting> renderers;

125
plugins/GSdx/GSUtil.cpp
View File

@ -277,121 +277,52 @@ bool GSUtil::CheckDirectX()
// DX11 Detection (includes DXGI detection and dynamic library method bindings)
// ---------------------------------------------------------------------------------
// Code 'Borrowed' from Microsoft's DXGI sources -- Modified to suit our needs. --air
// Stripped down because of unnecessary complexity and false positives
// e.g. (d3d11_beta.dll would fail at device creation time) --pseudonym
typedef HRESULT (WINAPI * FNPTR_CREATEDXGIFACTORY)(REFIID, void**);
static int s_DXGI;
static int s_D3D11;
typedef HRESULT (WINAPI * FNPTR_D3D11CREATEDEVICEANDSWAPCHAIN) (
__in IDXGIAdapter *pAdapter,
__in D3D_DRIVER_TYPE DriverType,
__in HMODULE Software,
__in UINT Flags,
__in const D3D_FEATURE_LEVEL *pFeatureLevels,
__in UINT FeatureLevels,
__in UINT SDKVersion,
__in const DXGI_SWAP_CHAIN_DESC *pSwapChainDesc,
__out IDXGISwapChain **ppSwapChain,
__out ID3D11Device **ppDevice,
__out D3D_FEATURE_LEVEL *pFeatureLevel,
__out ID3D11DeviceContext **ppImmediateContext
);
static HMODULE s_hModD3D11 = NULL;
static PFN_D3D11_CREATE_DEVICE s_DynamicD3D11CreateDevice = NULL;
static HMODULE s_hModDXGI = NULL;
static FNPTR_CREATEDXGIFACTORY s_DynamicCreateDXGIFactory = NULL;
static long s_D3D11Checked = 0;
static D3D_FEATURE_LEVEL s_D3D11Level = (D3D_FEATURE_LEVEL)0;
static bool DXUTDelayLoadDXGI()
bool GSUtil::CheckDXGI()
{
if(s_DynamicD3D11CreateDevice == NULL)
if (0 == s_DXGI)
{
s_hModDXGI = LoadLibrary("dxgi.dll");
if(s_hModDXGI != NULL)
{
s_DynamicCreateDXGIFactory = (FNPTR_CREATEDXGIFACTORY)GetProcAddress(s_hModDXGI, "CreateDXGIFactory");
}
// If DXGI isn't installed then this system isn't even capable of DX11 support; so no point
// in checking for DX11 DLLs.
if(s_DynamicCreateDXGIFactory == NULL)
{
return false;
}
s_hModD3D11 = LoadLibrary("d3d11.dll");
if(s_hModD3D11 == NULL)
{
s_hModD3D11 = LoadLibrary("d3d11_beta.dll");
}
if(s_hModD3D11 != NULL)
{
s_DynamicD3D11CreateDevice = (PFN_D3D11_CREATE_DEVICE)GetProcAddress(s_hModD3D11, "D3D11CreateDevice");
}
if(s_DynamicD3D11CreateDevice == NULL)
{
return false;
}
HMODULE hmod = LoadLibrary("dxgi.dll");
s_DXGI = hmod ? 1 : -1;
if (hmod)
FreeLibrary(hmod);
}
CComPtr<IDXGIFactory> f;
return s_DynamicCreateDXGIFactory(__uuidof(IDXGIFactory), (LPVOID*)&f) == S_OK && f != NULL;
return s_DXGI > 0;
}
bool GSUtil::CheckDirect3D11Level(D3D_FEATURE_LEVEL& level)
bool GSUtil::CheckD3D11()
{
HRESULT hr = S_OK;
if (!CheckDXGI())
return false;
level = (D3D_FEATURE_LEVEL)0;
if(!_interlockedbittestandset(&s_D3D11Checked, 0)) // thread safety...
if (0 == s_D3D11)
{
if(!DXUTDelayLoadDXGI())
{
UnloadDynamicLibraries();
return false;
}
const D3D_FEATURE_LEVEL levels[] =
{
D3D_FEATURE_LEVEL_11_0,
D3D_FEATURE_LEVEL_10_1,
D3D_FEATURE_LEVEL_10_0,
D3D_FEATURE_LEVEL_9_3,
D3D_FEATURE_LEVEL_9_2,
D3D_FEATURE_LEVEL_9_1,
};
CComPtr<ID3D11Device> dev;
CComPtr<ID3D11DeviceContext> ctx;
hr = s_DynamicD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, D3D11_CREATE_DEVICE_SINGLETHREADED, levels, countof(levels), D3D11_SDK_VERSION, &dev, &level, &ctx);
s_D3D11Level = level;
HMODULE hmod = LoadLibrary("d3d11.dll");
s_D3D11 = hmod ? 1 : -1;
if (hmod)
FreeLibrary(hmod);
}
level = s_D3D11Level;
return SUCCEEDED(hr) && level >= D3D_FEATURE_LEVEL_9_1;
return s_D3D11 > 0;
}
void GSUtil::UnloadDynamicLibraries()
D3D_FEATURE_LEVEL GSUtil::CheckDirect3D11Level(IDXGIAdapter *adapter, D3D_DRIVER_TYPE type)
{
s_DynamicD3D11CreateDevice = NULL;
s_DynamicCreateDXGIFactory = NULL;
HRESULT hr;
D3D_FEATURE_LEVEL level;
if(s_hModD3D11) FreeLibrary(s_hModD3D11);
if(s_hModDXGI) FreeLibrary(s_hModDXGI);
if(!CheckD3D11())
return (D3D_FEATURE_LEVEL)0;
s_hModD3D11 = NULL;
s_hModDXGI = NULL;
hr = D3D11CreateDevice(adapter, type, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, &level, NULL);
return SUCCEEDED(hr) ? level : (D3D_FEATURE_LEVEL)0;
}
#endif

5
plugins/GSdx/GSUtil.h
View File

@ -42,8 +42,9 @@ public:
#ifdef _WINDOWS
static bool CheckDirectX();
static bool CheckDirect3D11Level(D3D_FEATURE_LEVEL& level);
static void UnloadDynamicLibraries();
static bool CheckDXGI();
static bool CheckD3D11();
static D3D_FEATURE_LEVEL CheckDirect3D11Level(IDXGIAdapter *adapter = NULL, D3D_DRIVER_TYPE type = D3D_DRIVER_TYPE_HARDWARE);
#endif
};