lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-23 06:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow customising D3D11 device creation flags in D3D11 demos

Browse Source
This commit is contained in:
baldurk
2018-12-12 13:55:16 +00:00
parent 556cd39276
commit 7880cc5d7b
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/d3d11/d3d11_test.cpp
+11 -12
View File
@@ -152,25 +152,27 @@ bool D3D11GraphicsTest::Init(int argc, char **argv)
}
}
UINT flags = createFlags | (debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0);
if(headless)
{
hr = dyn_D3D11CreateDevice(adapter, driver, NULL, debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0,
features, 1, D3D11_SDK_VERSION, &dev, NULL, &ctx);
hr = dyn_D3D11CreateDevice(adapter, driver, NULL, flags, features, 1, D3D11_SDK_VERSION, &dev,
NULL, &ctx);
// if it failed but on a high feature level, try again on warp
if(FAILED(hr) && features[0] != D3D_FEATURE_LEVEL_11_0)
{
driver = D3D_DRIVER_TYPE_WARP;
hr = dyn_D3D11CreateDevice(adapter, driver, NULL, debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0,
features, 1, D3D11_SDK_VERSION, &dev, NULL, &ctx);
hr = dyn_D3D11CreateDevice(adapter, driver, NULL, flags, features, 1, D3D11_SDK_VERSION, &dev,
NULL, &ctx);
}
// if it failed again on a high feature level, try last on ref
if(FAILED(hr) && features[0] != D3D_FEATURE_LEVEL_11_0)
{
driver = D3D_DRIVER_TYPE_REFERENCE;
hr = dyn_D3D11CreateDevice(adapter, driver, NULL, debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0,
features, 1, D3D11_SDK_VERSION, &dev, NULL, &ctx);
hr = dyn_D3D11CreateDevice(adapter, driver, NULL, flags, features, 1, D3D11_SDK_VERSION, &dev,
NULL, &ctx);
}
if(FAILED(hr))
@@ -202,16 +204,14 @@ bool D3D11GraphicsTest::Init(int argc, char **argv)
swapDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
swapDesc.Flags = 0;
hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL,
debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0, features, 1,
hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL, flags, features, 1,
D3D11_SDK_VERSION, &swapDesc, &swap, &dev, NULL, &ctx);
// if it failed but on a high feature level, try again on warp
if(FAILED(hr))
{
driver = D3D_DRIVER_TYPE_WARP;
hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL,
debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0, features, 1,
hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL, flags, features, 1,
D3D11_SDK_VERSION, &swapDesc, &swap, &dev, NULL, &ctx);
}
@@ -219,8 +219,7 @@ bool D3D11GraphicsTest::Init(int argc, char **argv)
if(FAILED(hr))
{
driver = D3D_DRIVER_TYPE_REFERENCE;
hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL,
debugDevice ? D3D11_CREATE_DEVICE_DEBUG : 0, features, 1,
hr = dyn_D3D11CreateDeviceAndSwapChain(adapter, driver, NULL, flags, features, 1,
D3D11_SDK_VERSION, &swapDesc, &swap, &dev, NULL, &ctx);
}
util/test/demos/d3d11/d3d11_test.h
+1
View File
@@ -154,6 +154,7 @@ struct D3D11GraphicsTest : public GraphicsTest
int backbufferMSAA = 1;
bool d3d11_1 = false;
bool d3d11_2 = false;
UINT createFlags = 0;
D3D11_FEATURE_DATA_D3D11_OPTIONS opts;
D3D11_FEATURE_DATA_D3D11_OPTIONS1 opts1;