diff options
Diffstat (limited to 'tests/manual/rhi/offscreen/offscreen.cpp')
-rw-r--r-- | tests/manual/rhi/offscreen/offscreen.cpp | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/tests/manual/rhi/offscreen/offscreen.cpp b/tests/manual/rhi/offscreen/offscreen.cpp index 83739efb51..86bf5ad5a9 100644 --- a/tests/manual/rhi/offscreen/offscreen.cpp +++ b/tests/manual/rhi/offscreen/offscreen.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 <QGuiApplication> #include <QImage> @@ -7,27 +7,10 @@ #include <QFile> #include <QLoggingCategory> #include <QCommandLineParser> -#include <QtGui/private/qshader_p.h> - -#include <QtGui/private/qrhinull_p.h> - -#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 +#include <QOffscreenSurface> -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif +#include <rhi/qrhi.h> //#define TEST_FINISH @@ -51,6 +34,7 @@ enum GraphicsApi OpenGL, Vulkan, D3D11, + D3D12, Metal, Null }; @@ -66,6 +50,8 @@ QString graphicsApiName() return QLatin1String("Vulkan"); case D3D11: return QLatin1String("Direct3D 11"); + case D3D12: + return QLatin1String("Direct3D 12"); case Metal: return QLatin1String("Metal"); case Null: @@ -82,7 +68,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; @@ -96,8 +82,10 @@ int main(int argc, char **argv) cmdLineParser.addOption(glOption); QCommandLineOption vkOption({ "v", "vulkan" }, QLatin1String("Vulkan")); cmdLineParser.addOption(vkOption); - QCommandLineOption d3dOption({ "d", "d3d11" }, QLatin1String("Direct3D 11")); - cmdLineParser.addOption(d3dOption); + QCommandLineOption d3d11Option({ "d", "d3d11" }, QLatin1String("Direct3D 11")); + cmdLineParser.addOption(d3d11Option); + QCommandLineOption d3d12Option({ "D", "d3d12" }, QLatin1String("Direct3D 12")); + cmdLineParser.addOption(d3d12Option); QCommandLineOption mtlOption({ "m", "metal" }, QLatin1String("Metal")); cmdLineParser.addOption(mtlOption); QCommandLineOption nullOption({ "n", "null" }, QLatin1String("Null")); @@ -107,8 +95,10 @@ int main(int argc, char **argv) graphicsApi = OpenGL; if (cmdLineParser.isSet(vkOption)) graphicsApi = Vulkan; - if (cmdLineParser.isSet(d3dOption)) + if (cmdLineParser.isSet(d3d11Option)) graphicsApi = D3D11; + if (cmdLineParser.isSet(d3d12Option)) + graphicsApi = D3D12; if (cmdLineParser.isSet(mtlOption)) graphicsApi = Metal; if (cmdLineParser.isSet(nullOption)) @@ -118,10 +108,11 @@ int main(int argc, char **argv) qDebug("This is a multi-api example, use command line arguments to override:\n%s", qPrintable(cmdLineParser.helpText())); QRhi *r = nullptr; + QRhi::Flags rhiFlags = QRhi::EnableTimestamps; if (graphicsApi == Null) { QRhiNullInitParams params; - r = QRhi::create(QRhi::Null, ¶ms); + r = QRhi::create(QRhi::Null, ¶ms, rhiFlags); } #if QT_CONFIG(vulkan) @@ -129,10 +120,11 @@ int main(int argc, char **argv) if (graphicsApi == Vulkan) { QLoggingCategory::setFilterRules(QStringLiteral("qt.vulkan=true")); inst.setLayers({ "VK_LAYER_KHRONOS_validation" }); + inst.setExtensions(QRhiVulkanInitParams::preferredInstanceExtensions()); if (inst.create()) { QRhiVulkanInitParams params; params.inst = &inst; - r = QRhi::create(QRhi::Vulkan, ¶ms); + r = QRhi::create(QRhi::Vulkan, ¶ms, rhiFlags); } else { qWarning("Failed to create Vulkan instance, switching to OpenGL"); graphicsApi = OpenGL; @@ -146,7 +138,7 @@ int main(int argc, char **argv) offscreenSurface.reset(QRhiGles2InitParams::newFallbackSurface()); QRhiGles2InitParams params; params.fallbackSurface = offscreenSurface.data(); - r = QRhi::create(QRhi::OpenGLES2, ¶ms); + r = QRhi::create(QRhi::OpenGLES2, ¶ms, rhiFlags); } #endif @@ -154,14 +146,18 @@ int main(int argc, char **argv) if (graphicsApi == D3D11) { QRhiD3D11InitParams params; params.enableDebugLayer = true; - r = QRhi::create(QRhi::D3D11, ¶ms); + r = QRhi::create(QRhi::D3D11, ¶ms, rhiFlags); + } else if (graphicsApi == D3D12) { + QRhiD3D12InitParams params; + params.enableDebugLayer = true; + r = QRhi::create(QRhi::D3D12, ¶ms, rhiFlags); } #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if QT_CONFIG(metal) if (graphicsApi == Metal) { QRhiMetalInitParams params; - r = QRhi::create(QRhi::Metal, ¶ms); + r = QRhi::create(QRhi::Metal, ¶ms, rhiFlags); } #endif @@ -288,6 +284,8 @@ int main(int argc, char **argv) #ifdef TEST_FINISH r->endOffscreenFrame(); #endif + if (r->isFeatureSupported(QRhi::Timestamps)) + qDebug() << "GPU time:" << cb->lastCompletedGpuTime() << "seconds (may refer to a previous frame)"; } delete ps; |