diff options
Diffstat (limited to 'tests/manual/rhi/multiwindow')
-rw-r--r-- | tests/manual/rhi/multiwindow/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/manual/rhi/multiwindow/multiwindow.cpp | 40 |
2 files changed, 18 insertions, 28 deletions
diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt index 640d52e5e0..70e5d3823c 100644 --- a/tests/manual/rhi/multiwindow/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from multiwindow.pro. - ##################################################################### ## multiwindow Binary: ##################################################################### @@ -35,7 +33,3 @@ qt_internal_add_resource(multiwindow "multiwindow" FILES ${multiwindow_resource_files} ) - - -#### Keys ignored in scope 1:.:.:multiwindow.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp index f25a68c621..bea4af2d48 100644 --- a/tests/manual/rhi/multiwindow/multiwindow.cpp +++ b/tests/manual/rhi/multiwindow/multiwindow.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QApplication> #include <QWidget> @@ -13,33 +13,17 @@ #include <QWindow> #include <QPlatformSurfaceEvent> #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> enum GraphicsApi { OpenGL, Vulkan, D3D11, + D3D12, Metal }; @@ -54,6 +38,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: @@ -98,10 +84,14 @@ void createRhi() QRhiD3D11InitParams params; params.enableDebugLayer = true; r.r = QRhi::create(QRhi::D3D11, ¶ms); + } else if (graphicsApi == D3D12) { + QRhiD3D12InitParams params; + params.enableDebugLayer = true; + r.r = QRhi::create(QRhi::D3D12, ¶ms); } #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if QT_CONFIG(metal) if (graphicsApi == Metal) { QRhiMetalInitParams params; r.r = QRhi::create(QRhi::Metal, ¶ms); @@ -281,6 +271,7 @@ Window::Window(const QString &title, const QColor &bgColor, int axis, bool noVSy #endif break; case D3D11: + case D3D12: setSurfaceType(Direct3DSurface); break; case Metal: @@ -478,7 +469,7 @@ int main(int argc, char **argv) #if defined(Q_OS_WIN) graphicsApi = D3D11; -#elif defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#elif QT_CONFIG(metal) graphicsApi = Metal; #elif QT_CONFIG(vulkan) graphicsApi = Vulkan; @@ -494,6 +485,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); @@ -503,6 +496,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; @@ -517,6 +512,7 @@ int main(int argc, char **argv) r.instance = new QVulkanInstance; if (graphicsApi == Vulkan) { r.instance->setLayers({ "VK_LAYER_KHRONOS_validation" }); + r.instance->setExtensions(QRhiVulkanInitParams::preferredInstanceExtensions()); if (!r.instance->create()) { qWarning("Failed to create Vulkan instance, switching to OpenGL"); graphicsApi = OpenGL; |