From edae79ed0c9638054aac74764ba2e69a61b88f7f Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Fri, 6 Oct 2017 15:29:17 +0200 Subject: [PATCH] Backed out changeset 3e5a825eac7d (bug 1371190) --- .../renderer/d3d/d3d11/Renderer11.cpp | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp index 07784be7bcb3..b0a0e9c3c595 100644 --- a/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +++ b/gfx/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp @@ -777,18 +777,6 @@ egl::Error Renderer11::initializeD3DDevice() D3D11_SDK_VERSION, &mDevice, &(mRenderer11DeviceCaps.featureLevel), &mDeviceContext); - if (result == E_INVALIDARG && - mAvailableFeatureLevels[0] == D3D_FEATURE_LEVEL_11_1) - { - // In some older Windows platform, D3D11.1 is not supported which returns E_INVALIDARG - // so we omit the 11.1 feature level flag and try again - result = D3D11CreateDevice(nullptr, mRequestedDriverType, nullptr, - D3D11_CREATE_DEVICE_DEBUG, mAvailableFeatureLevels.data()+1, - static_cast(mAvailableFeatureLevels.size())-1, - D3D11_SDK_VERSION, &mDevice, - &(mRenderer11DeviceCaps.featureLevel), &mDeviceContext); - } - if (!mDevice || FAILED(result)) { WARN() << "Failed creating Debug D3D11 device - falling back to release runtime."; @@ -805,17 +793,6 @@ egl::Error Renderer11::initializeD3DDevice() static_cast(mAvailableFeatureLevels.size()), D3D11_SDK_VERSION, &mDevice, &(mRenderer11DeviceCaps.featureLevel), &mDeviceContext); - if (result == E_INVALIDARG && - mAvailableFeatureLevels[0] == D3D_FEATURE_LEVEL_11_1) - { - // In some older Windows platform, D3D11.1 is not supported which returns E_INVALIDARG - // so we omit the 11.1 feature level flag and try again - result = D3D11CreateDevice( - nullptr, mRequestedDriverType, nullptr, 0, mAvailableFeatureLevels.data()+1, - static_cast(mAvailableFeatureLevels.size())-1, D3D11_SDK_VERSION, - &mDevice, &(mRenderer11DeviceCaps.featureLevel), &mDeviceContext); - } - // Cleanup done by destructor if (!mDevice || FAILED(result)) {