mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-09 01:28:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5337 from stenzek/d3d-common-blending-state

Browse source 
D3D: Use blending state from VideoCommon
This commit is contained in:
Anthony 2017-09-03 19:25:46 -07:00 • committed by GitHub
commit 26e777d80b
13 changed files with 51 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/VideoBackends/D3D/D3DBase.cpp
View file

@ -306,9 +306,9 @@ HRESULT Create(HWND wnd)
swap_chain_desc.Height = yres;
swap_chain_desc.Stereo = g_ActiveConfig.iStereoMode == STEREO_QUADBUFFER;
#if defined(_DEBUG) || defined(DEBUGFAST)
// Creating debug devices can sometimes fail if the user doesn't have the correct
// version of the DirectX SDK. If it does, simply fallback to a non-debug device.
if (g_Config.bEnableValidationLayer)
{
hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_DEBUG,
supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
@ -334,8 +334,7 @@ HRESULT Create(HWND wnd)
}
}
if (FAILED(hr))
#endif
if (!g_Config.bEnableValidationLayer || FAILED(hr))
{
hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0, supported_feature_levels,
NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &device, &featlevel,