diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-11-02 07:00:18 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2021-07-30 08:02:56 +0200 |
| commit | 5f5c342924a0d9a2856b2f2d6db373e25723f2b0 (patch) | |
| tree | 5a0c95642e83b46a91e7af735df0644287afab7b /src/gui/rhi | |
| parent | 2c6bc06267b2599d491d5c84b29a368e6a922bc1 (diff) | |
Remove Windows 7, 8, and 8.1 codepaths
Pick-to: 6.2
Task-number: QTBUG-84432
Change-Id: I970d7d7e9ebdcf246a5be32d60066b4e5e948c27
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/gui/rhi')
| -rw-r--r-- | src/gui/rhi/qrhid3d11.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp index 6b4be76fef..93d3e30943 100644 --- a/src/gui/rhi/qrhid3d11.cpp +++ b/src/gui/rhi/qrhid3d11.cpp @@ -170,18 +170,16 @@ inline Int aligned(Int v, Int byteAlign) static IDXGIFactory1 *createDXGIFactory2() { IDXGIFactory1 *result = nullptr; - if (QOperatingSystemVersion::current() > QOperatingSystemVersion::Windows7) { - using PtrCreateDXGIFactory2 = HRESULT (WINAPI *)(UINT, REFIID, void **); - QSystemLibrary dxgilib(QStringLiteral("dxgi")); - if (auto createDXGIFactory2 = reinterpret_cast<PtrCreateDXGIFactory2>(dxgilib.resolve("CreateDXGIFactory2"))) { - const HRESULT hr = createDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast<void **>(&result)); - if (FAILED(hr)) { - qWarning("CreateDXGIFactory2() failed to create DXGI factory: %s", qPrintable(comErrorMessage(hr))); - result = nullptr; - } - } else { - qWarning("Unable to resolve CreateDXGIFactory2()"); + using PtrCreateDXGIFactory2 = HRESULT (WINAPI *)(UINT, REFIID, void **); + QSystemLibrary dxgilib(QStringLiteral("dxgi")); + if (auto createDXGIFactory2 = reinterpret_cast<PtrCreateDXGIFactory2>(dxgilib.resolve("CreateDXGIFactory2"))) { + const HRESULT hr = createDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast<void **>(&result)); + if (FAILED(hr)) { + qWarning("CreateDXGIFactory2() failed to create DXGI factory: %s", qPrintable(comErrorMessage(hr))); + result = nullptr; } + } else { + qWarning("Unable to resolve CreateDXGIFactory2()"); } return result; } |