mirror of
https://github.com/crystalidea/qt6windows7.git
synced 2025-07-08 10:29:09 +08:00
qt 6.6.0 clean
This commit is contained in:
@ -16,27 +16,10 @@
|
||||
#include <QEvent>
|
||||
#include <QCommandLineParser>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
#include <QtGui/private/qshader_p.h>
|
||||
#include <QFile>
|
||||
|
||||
#ifndef QT_NO_OPENGL
|
||||
#include <QtGui/private/qrhigles2_p.h>
|
||||
#include <QOffscreenSurface>
|
||||
#endif
|
||||
|
||||
#if QT_CONFIG(vulkan)
|
||||
#include <QLoggingCategory>
|
||||
#include <QtGui/private/qrhivulkan_p.h>
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QtGui/private/qrhid3d11_p.h>
|
||||
#endif
|
||||
|
||||
#if defined(Q_OS_MACOS) || defined(Q_OS_IOS)
|
||||
#include <QtGui/private/qrhimetal_p.h>
|
||||
#endif
|
||||
#include <QOffscreenSurface>
|
||||
#include <rhi/qrhi.h>
|
||||
|
||||
#ifdef Q_OS_DARWIN
|
||||
#include <QtCore/private/qcore_mac_p.h>
|
||||
@ -66,6 +49,8 @@ static QString graphicsApiName()
|
||||
return QLatin1String("Vulkan");
|
||||
case D3D11:
|
||||
return QLatin1String("Direct3D 11");
|
||||
case D3D12:
|
||||
return QLatin1String("Direct3D 12");
|
||||
case Metal:
|
||||
return QLatin1String("Metal");
|
||||
default:
|
||||
@ -329,6 +314,10 @@ void Renderer::createRhi()
|
||||
QRhiD3D11InitParams params;
|
||||
params.enableDebugLayer = true;
|
||||
r = QRhi::create(QRhi::D3D11, ¶ms, rhiFlags);
|
||||
} else if (graphicsApi == D3D12) {
|
||||
QRhiD3D12InitParams params;
|
||||
params.enableDebugLayer = true;
|
||||
r = QRhi::create(QRhi::D3D12, ¶ms, rhiFlags);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -681,6 +670,8 @@ int main(int argc, char **argv)
|
||||
cmdLineParser.addOption(vkOption);
|
||||
QCommandLineOption d3dOption({ "d", "d3d11" }, QLatin1String("Direct3D 11"));
|
||||
cmdLineParser.addOption(d3dOption);
|
||||
QCommandLineOption d3d12Option({ "D", "d3d12" }, QLatin1String("Direct3D 12"));
|
||||
cmdLineParser.addOption(d3d12Option);
|
||||
QCommandLineOption mtlOption({ "m", "metal" }, QLatin1String("Metal"));
|
||||
cmdLineParser.addOption(mtlOption);
|
||||
cmdLineParser.process(app);
|
||||
@ -690,6 +681,8 @@ int main(int argc, char **argv)
|
||||
graphicsApi = Vulkan;
|
||||
if (cmdLineParser.isSet(d3dOption))
|
||||
graphicsApi = D3D11;
|
||||
if (cmdLineParser.isSet(d3d12Option))
|
||||
graphicsApi = D3D12;
|
||||
if (cmdLineParser.isSet(mtlOption))
|
||||
graphicsApi = Metal;
|
||||
|
||||
|
@ -4,10 +4,6 @@
|
||||
#include "window.h"
|
||||
#include <QPlatformSurfaceEvent>
|
||||
|
||||
#ifndef QT_NO_OPENGL
|
||||
#include <QtGui/private/qrhigles2_p.h>
|
||||
#endif
|
||||
|
||||
#if QT_CONFIG(vulkan)
|
||||
extern QVulkanInstance *instance;
|
||||
#endif
|
||||
@ -25,6 +21,7 @@ Window::Window(const QString &title, GraphicsApi api)
|
||||
#endif
|
||||
break;
|
||||
case D3D11:
|
||||
case D3D12:
|
||||
setSurfaceType(Direct3DSurface);
|
||||
break;
|
||||
case Metal:
|
||||
|
@ -11,6 +11,7 @@ enum GraphicsApi
|
||||
OpenGL,
|
||||
Vulkan,
|
||||
D3D11,
|
||||
D3D12,
|
||||
Metal
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user