From 5f5c342924a0d9a2856b2f2d6db373e25723f2b0 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 2 Nov 2020 07:00:18 +0100 Subject: Remove Windows 7, 8, and 8.1 codepaths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.2 Task-number: QTBUG-84432 Change-Id: I970d7d7e9ebdcf246a5be32d60066b4e5e948c27 Reviewed-by: Mårten Nordheim --- src/gui/rhi/qrhid3d11.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/gui/rhi/qrhid3d11.cpp') 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(dxgilib.resolve("CreateDXGIFactory2"))) { - const HRESULT hr = createDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast(&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(dxgilib.resolve("CreateDXGIFactory2"))) { + const HRESULT hr = createDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast(&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; } -- cgit v1.2.3