diff options
Diffstat (limited to 'tests/manual/rhi/multiwindow_threaded/window.cpp')
-rw-r--r-- | tests/manual/rhi/multiwindow_threaded/window.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/manual/rhi/multiwindow_threaded/window.cpp b/tests/manual/rhi/multiwindow_threaded/window.cpp index 9c0d5bfdf9..d9c7340237 100644 --- a/tests/manual/rhi/multiwindow_threaded/window.cpp +++ b/tests/manual/rhi/multiwindow_threaded/window.cpp @@ -1,13 +1,9 @@ // 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 "window.h" #include <QPlatformSurfaceEvent> -#ifndef QT_NO_OPENGL -#include <QtGui/private/qrhigles2_p.h> -#endif - #if QT_CONFIG(vulkan) extern QVulkanInstance *instance; #endif @@ -16,18 +12,16 @@ Window::Window(const QString &title, GraphicsApi api) { switch (api) { case OpenGL: -#if QT_CONFIG(opengl) setSurfaceType(OpenGLSurface); - setFormat(QRhiGles2InitParams::adjustedFormat()); -#endif break; case Vulkan: -#if QT_CONFIG(vulkan) setSurfaceType(VulkanSurface); +#if QT_CONFIG(vulkan) setVulkanInstance(instance); #endif break; case D3D11: + case D3D12: setSurfaceType(Direct3DSurface); break; case Metal: |