DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inferring std::array template params for featureLevels. (#917)

Browse Source
This commit is contained in:
Scott Freeman 2020-01-09 15:05:49 -05:00 committed by Matt Cooley
parent 4f05b63ba6
commit bea4c2429f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/GraphControl/DirectX/DeviceResources.cpp
View File

@ -151,8 +151,7 @@ namespace GraphControl::DX
// Note the ordering should be preserved. // Note the ordering should be preserved.
// Don't forget to declare your application's minimum required feature level in its // Don't forget to declare your application's minimum required feature level in its
// description. All applications are assumed to support 9.1 unless otherwise stated. // description. All applications are assumed to support 9.1 unless otherwise stated.
static constexpr UINT featureLevelsSize = 9; static constexpr std::array featureLevels =
static constexpr std::array<D3D_FEATURE_LEVEL, featureLevelsSize> featureLevels =
{ {
D3D_FEATURE_LEVEL_12_1, D3D_FEATURE_LEVEL_12_1,
D3D_FEATURE_LEVEL_12_0, D3D_FEATURE_LEVEL_12_0,
@ -174,8 +173,8 @@ namespace GraphControl::DX
D3D_DRIVER_TYPE_HARDWARE, // Create a device using the hardware graphics driver. D3D_DRIVER_TYPE_HARDWARE, // Create a device using the hardware graphics driver.
0, // Should be 0 unless the driver is D3D_DRIVER_TYPE_SOFTWARE. 0, // Should be 0 unless the driver is D3D_DRIVER_TYPE_SOFTWARE.
creationFlags, // Set debug and Direct2D compatibility flags. creationFlags, // Set debug and Direct2D compatibility flags.
&featureLevels[0], // List of feature levels this app can support. featureLevels.data(), // List of feature levels this app can support.
featureLevelsSize, // Size of the list above. featureLevels.size(), // Size of the list above.
D3D11_SDK_VERSION, // Always set this to D3D11_SDK_VERSION for Windows Store apps. D3D11_SDK_VERSION, // Always set this to D3D11_SDK_VERSION for Windows Store apps.
&device, // Returns the Direct3D device created. &device, // Returns the Direct3D device created.
&m_d3dFeatureLevel, // Returns feature level of device created. &m_d3dFeatureLevel, // Returns feature level of device created.
@ -193,8 +192,8 @@ namespace GraphControl::DX
D3D_DRIVER_TYPE_WARP, // Create a WARP device instead of a hardware device. D3D_DRIVER_TYPE_WARP, // Create a WARP device instead of a hardware device.
0, 0,
creationFlags, creationFlags,
&featureLevels[0], featureLevels.data(),
featureLevelsSize, featureLevels.size(),
D3D11_SDK_VERSION, D3D11_SDK_VERSION,
&device, &device,
&m_d3dFeatureLevel, &m_d3dFeatureLevel,