diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-02-27 09:14:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 09:14:11 -0500 |
| commit | 15ed4527a28e757ae2617905188ebf19f16cb0a1 (patch) | |
| tree | f270b0f8cc760232ca2555ea6790e9ee80a11fdc /tools/gfx/render-d3d11.cpp | |
| parent | d9b73266ab46c9b4ba3b0d25d369e30143ac398f (diff) | |
Hotfix/device check review (#862)
* Fix typo on return type.
* * Inverted order of FlagCombiner (to make more 'nested for' like)
* On Dx12 just use D3D_FEATURE_LEVEL_11_0
* Fix typo on dll name
Diffstat (limited to 'tools/gfx/render-d3d11.cpp')
| -rw-r--r-- | tools/gfx/render-d3d11.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/gfx/render-d3d11.cpp b/tools/gfx/render-d3d11.cpp index 054786f81..1848755bc 100644 --- a/tools/gfx/render-d3d11.cpp +++ b/tools/gfx/render-d3d11.cpp @@ -452,9 +452,6 @@ SlangResult D3D11Renderer::initialize(const Desc& desc, void* inWindowHandle) // with 11_1 and then back off to 11_0 if that fails. FlagCombiner combiner; - combiner.add(DeviceCheckFlag::UseFullFeatureLevel, ChangeType::OnOff); ///< First try fully featured, then degrade features - combiner.add(DeviceCheckFlag::UseHardwareDevice, ChangeType::OnOff); ///< First try hardware, then reference - // TODO: we should probably provide a command-line option // to override UseDebug of default rather than leave it // up to each back-end to specify. @@ -464,6 +461,8 @@ SlangResult D3D11Renderer::initialize(const Desc& desc, void* inWindowHandle) #else combiner.add(DeviceCheckFlag::UseDebug, ChangeType::Off); ///< Don't bother with debug #endif + combiner.add(DeviceCheckFlag::UseHardwareDevice, ChangeType::OnOff); ///< First try hardware, then reference + combiner.add(DeviceCheckFlag::UseFullFeatureLevel, ChangeType::OnOff); ///< First try fully featured, then degrade features const int numCombinations = combiner.getNumCombinations(); Result res = SLANG_FAIL; |