From ff31815659cf4e2d2ce50795f8bd665fd02f9389 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Fri, 30 Jul 2021 16:56:53 +0800
Subject: d3d11rhi: remove pre-win10 code

CreateDXGIFactory2() is always available from Windows 8.1
No need to load it dynamically.

Task-number: QTBUG-84432
Change-Id: I84d82f30327df416e1fdbac256b63512900c07b7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 1e085b9e15abeb45bbbf7995818fcd9c94bfefe1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/rhi/qrhid3d11.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
index c02197b151..bdbb6f538b 100644
--- a/src/gui/rhi/qrhid3d11.cpp
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -47,6 +47,7 @@
 
 #include <d3dcompiler.h>
 #include <comdef.h>
+#include <dxgi1_3.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -170,16 +171,10 @@ inline Int aligned(Int v, Int byteAlign)
 static IDXGIFactory1 *createDXGIFactory2()
 {
     IDXGIFactory1 *result = nullptr;
-    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()");
+    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;
     }
     return result;
 }
-- 
cgit v1.2.3