1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3d11rhi: remove pre-win10 code

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

Pick-to: 6.2
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>
This commit is contained in:
Yuhang Zhao 2021-07-30 16:56:53 +08:00
parent c2cbd80425
commit 1e085b9e15
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/rhi/qrhid3d11.cpp
View File

@ -47,6 +47,7 @@
#include <d3dcompiler.h> #include <d3dcompiler.h>
#include <comdef.h> #include <comdef.h>
#include <dxgi1_3.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -170,16 +171,10 @@ inline Int aligned(Int v, Int byteAlign)
static IDXGIFactory1 *createDXGIFactory2() static IDXGIFactory1 *createDXGIFactory2()
{ {
IDXGIFactory1 *result = nullptr; IDXGIFactory1 *result = nullptr;
using PtrCreateDXGIFactory2 = HRESULT (WINAPI *)(UINT, REFIID, void **); const HRESULT hr = CreateDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast<void **>(&result));
QSystemLibrary dxgilib(QStringLiteral("dxgi")); if (FAILED(hr)) {
if (auto createDXGIFactory2 = reinterpret_cast<PtrCreateDXGIFactory2>(dxgilib.resolve("CreateDXGIFactory2"))) { qWarning("CreateDXGIFactory2() failed to create DXGI factory: %s", qPrintable(comErrorMessage(hr)));
const HRESULT hr = createDXGIFactory2(0, IID_IDXGIFactory2, reinterpret_cast<void **>(&result)); result = nullptr;
if (FAILED(hr)) {
qWarning("CreateDXGIFactory2() failed to create DXGI factory: %s", qPrintable(comErrorMessage(hr)));
result = nullptr;
}
} else {
qWarning("Unable to resolve CreateDXGIFactory2()");
} }
return result; return result;
} }