diff options
Diffstat (limited to 'tests/manual')
21 files changed, 47 insertions, 111 deletions
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp b/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp index 9cbcebb380..895d7f0007 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/hellowindow.cpp @@ -3,7 +3,7 @@ #include "hellowindow.h" #include <QFile> -#include <QtGui/private/qshader_p.h> +#include <rhi/qshader.h> static float vertexData[] = { // Y up (note clipSpaceCorrMatrix in m_proj), CCW diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/window.h b/tests/manual/rhi/hellominimalcrossgfxtriangle/window.h index b3223e8042..5f0fc09941 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/window.h +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/window.h @@ -5,22 +5,8 @@ #define WINDOW_H #include <QWindow> - -#include <QtGui/private/qrhinull_p.h> -#if QT_CONFIG(opengl) -#include <QtGui/private/qrhigles2_p.h> #include <QOffscreenSurface> -#endif -#if QT_CONFIG(vulkan) -#include <QtGui/private/qrhivulkan_p.h> -#endif -#ifdef Q_OS_WIN -#include <QtGui/private/qrhid3d11_p.h> -#include <QtGui/private/qrhid3d12_p.h> -#endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif +#include <rhi/qrhi.h> class Window : public QWindow { diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp index f25a68c621..7ff6644e26 100644 --- a/tests/manual/rhi/multiwindow/multiwindow.cpp +++ b/tests/manual/rhi/multiwindow/multiwindow.cpp @@ -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,6 +84,10 @@ 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 @@ -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: @@ -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; diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp index d817c90c69..eff0b536d0 100644 --- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp +++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp @@ -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; diff --git a/tests/manual/rhi/multiwindow_threaded/window.cpp b/tests/manual/rhi/multiwindow_threaded/window.cpp index ea098b7f37..7b5ecf1634 100644 --- a/tests/manual/rhi/multiwindow_threaded/window.cpp +++ b/tests/manual/rhi/multiwindow_threaded/window.cpp @@ -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: diff --git a/tests/manual/rhi/multiwindow_threaded/window.h b/tests/manual/rhi/multiwindow_threaded/window.h index 3e0212f772..da1269283a 100644 --- a/tests/manual/rhi/multiwindow_threaded/window.h +++ b/tests/manual/rhi/multiwindow_threaded/window.h @@ -11,6 +11,7 @@ enum GraphicsApi OpenGL, Vulkan, D3D11, + D3D12, Metal }; diff --git a/tests/manual/rhi/offscreen/offscreen.cpp b/tests/manual/rhi/offscreen/offscreen.cpp index 1334fe3fb6..04ce8543ac 100644 --- a/tests/manual/rhi/offscreen/offscreen.cpp +++ b/tests/manual/rhi/offscreen/offscreen.cpp @@ -7,28 +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> -#include <QtGui/private/qrhid3d12_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 diff --git a/tests/manual/rhi/rhiwidget/examplewidget.h b/tests/manual/rhi/rhiwidget/examplewidget.h index 1b58eedc20..b85ae6f1f7 100644 --- a/tests/manual/rhi/rhiwidget/examplewidget.h +++ b/tests/manual/rhi/rhiwidget/examplewidget.h @@ -5,7 +5,7 @@ #define EXAMPLEWIDGET_H #include "rhiwidget.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> class ExampleRhiWidget : public QRhiWidget { diff --git a/tests/manual/rhi/rhiwidget/rhiwidget.h b/tests/manual/rhi/rhiwidget/rhiwidget.h index 12ca7db413..94cc108e28 100644 --- a/tests/manual/rhi/rhiwidget/rhiwidget.h +++ b/tests/manual/rhi/rhiwidget/rhiwidget.h @@ -5,7 +5,7 @@ #define RHIWIDGET_H #include <QWidget> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> class QRhiWidgetPrivate; diff --git a/tests/manual/rhi/shared/examplefw.h b/tests/manual/rhi/shared/examplefw.h index 75f48aa0c7..2bab0a9e68 100644 --- a/tests/manual/rhi/shared/examplefw.h +++ b/tests/manual/rhi/shared/examplefw.h @@ -13,28 +13,9 @@ #include <QTimer> #include <QLoggingCategory> #include <QColorSpace> - -#include <QtGui/private/qshader_p.h> #include <QFile> -#include <QtGui/private/qrhinull_p.h> - -#ifndef QT_NO_OPENGL -#include <QtGui/private/qrhigles2_p.h> #include <QOffscreenSurface> -#endif - -#if QT_CONFIG(vulkan) -#include <QtGui/private/qrhivulkan_p.h> -#endif - -#ifdef Q_OS_WIN -#include <QtGui/private/qrhid3d11_p.h> -#include <QtGui/private/qrhid3d12_p.h> -#endif - -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif +#include <rhi/qrhi.h> #ifdef EXAMPLEFW_IMGUI #include "qrhiimgui_p.h" diff --git a/tests/manual/rhi/shared/imgui/qrhiimgui_p.h b/tests/manual/rhi/shared/imgui/qrhiimgui_p.h index 1b4b4d67b6..31782144bf 100644 --- a/tests/manual/rhi/shared/imgui/qrhiimgui_p.h +++ b/tests/manual/rhi/shared/imgui/qrhiimgui_p.h @@ -4,7 +4,7 @@ #ifndef QRHIIMGUI_P_H #define QRHIIMGUI_P_H -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> QT_BEGIN_NAMESPACE diff --git a/tests/manual/rhi/stereo/window.cpp b/tests/manual/rhi/stereo/window.cpp index a3785badca..391e8b75fc 100644 --- a/tests/manual/rhi/stereo/window.cpp +++ b/tests/manual/rhi/stereo/window.cpp @@ -5,7 +5,7 @@ #include <QPlatformSurfaceEvent> #include <QTimer> #include <QFile> -#include <QtGui/private/qshader_p.h> +#include <rhi/qshader.h> #include "../shared/cube.h" Window::Window() diff --git a/tests/manual/rhi/stereo/window.h b/tests/manual/rhi/stereo/window.h index 28e25dfdb4..ea35040a7a 100644 --- a/tests/manual/rhi/stereo/window.h +++ b/tests/manual/rhi/stereo/window.h @@ -5,8 +5,8 @@ #define WINDOW_H #include <QWindow> -#include <QtGui/private/qrhigles2_p.h> #include <QOffscreenSurface> +#include <rhi/qrhi.h> class Window : public QWindow { diff --git a/tests/manual/rhi/triquadcube/quadrenderer.cpp b/tests/manual/rhi/triquadcube/quadrenderer.cpp index 4536412309..09c2047c35 100644 --- a/tests/manual/rhi/triquadcube/quadrenderer.cpp +++ b/tests/manual/rhi/triquadcube/quadrenderer.cpp @@ -3,7 +3,7 @@ #include "quadrenderer.h" #include <QFile> -#include <QtGui/private/qshader_p.h> +#include <rhi/qshader.h> // Renders a quad using indexed drawing. No QRhiGraphicsPipeline is created, it // expects to reuse the one created by TriangleRenderer. A separate diff --git a/tests/manual/rhi/triquadcube/quadrenderer.h b/tests/manual/rhi/triquadcube/quadrenderer.h index a9f882fe54..f8757992ff 100644 --- a/tests/manual/rhi/triquadcube/quadrenderer.h +++ b/tests/manual/rhi/triquadcube/quadrenderer.h @@ -4,7 +4,7 @@ #ifndef QUADRENDERER_H #define QUADRENDERER_H -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> class QuadRenderer { diff --git a/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp b/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp index 23b3c5c7c5..8e73194fc8 100644 --- a/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp +++ b/tests/manual/rhi/triquadcube/texturedcuberenderer.cpp @@ -3,7 +3,7 @@ #include "texturedcuberenderer.h" #include <QFile> -#include <QtGui/private/qshader_p.h> +#include <rhi/qshader.h> #include "../shared/cube.h" diff --git a/tests/manual/rhi/triquadcube/texturedcuberenderer.h b/tests/manual/rhi/triquadcube/texturedcuberenderer.h index 59517b2fef..0972ad6d46 100644 --- a/tests/manual/rhi/triquadcube/texturedcuberenderer.h +++ b/tests/manual/rhi/triquadcube/texturedcuberenderer.h @@ -4,7 +4,7 @@ #ifndef TEXTUREDCUBERENDERER_H #define TEXTUREDCUBERENDERER_H -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> class TexturedCubeRenderer { diff --git a/tests/manual/rhi/triquadcube/triangleoncuberenderer.cpp b/tests/manual/rhi/triquadcube/triangleoncuberenderer.cpp index b66d869642..683134589e 100644 --- a/tests/manual/rhi/triquadcube/triangleoncuberenderer.cpp +++ b/tests/manual/rhi/triquadcube/triangleoncuberenderer.cpp @@ -3,7 +3,7 @@ #include "triangleoncuberenderer.h" #include <QFile> -#include <QtGui/private/qshader_p.h> +#include <rhi/qshader.h> // toggle to test the preserved content (no clear) path const bool IMAGE_UNDER_OFFSCREEN_RENDERING = false; diff --git a/tests/manual/rhi/triquadcube/trianglerenderer.cpp b/tests/manual/rhi/triquadcube/trianglerenderer.cpp index 160a94ef46..46f6e0dec4 100644 --- a/tests/manual/rhi/triquadcube/trianglerenderer.cpp +++ b/tests/manual/rhi/triquadcube/trianglerenderer.cpp @@ -3,7 +3,7 @@ #include "trianglerenderer.h" #include <QFile> -#include <QtGui/private/qshader_p.h> +#include <rhi/qshader.h> //#define VBUF_IS_DYNAMIC diff --git a/tests/manual/rhi/triquadcube/trianglerenderer.h b/tests/manual/rhi/triquadcube/trianglerenderer.h index ec591eb284..e6e3d0c0a9 100644 --- a/tests/manual/rhi/triquadcube/trianglerenderer.h +++ b/tests/manual/rhi/triquadcube/trianglerenderer.h @@ -4,7 +4,7 @@ #ifndef TRIANGLERENDERER_H #define TRIANGLERENDERER_H -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> class TriangleRenderer { diff --git a/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp b/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp index ef19e0503f..6866fe229f 100644 --- a/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp +++ b/tests/manual/wasm/qstdweb/qwasmcompositor_main.cpp @@ -7,7 +7,7 @@ #include <QtGui/qguiapplication.h> #include <QtGui/qoffscreensurface.h> #include <QtGui/qpa/qwindowsysteminterface.h> -#include <QtGui/private/qrhigles2_p.h> +#include <QtGui/rhi/qrhi.h> #include <qtwasmtestlib.h> |