From 15ed4527a28e757ae2617905188ebf19f16cb0a1 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 27 Feb 2019 09:14:11 -0500 Subject: 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 --- tools/gfx/render-d3d11.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/gfx/render-d3d11.cpp') 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; -- cgit v1.2.3