diff options
Diffstat (limited to 'tests/manual')
5 files changed, 12 insertions, 15 deletions
diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp b/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp index 2a3475538d..c75dd73908 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/window.cpp @@ -11,9 +11,6 @@ Window::Window(QRhi::Implementation graphicsApi) switch (graphicsApi) { case QRhi::OpenGLES2: setSurfaceType(OpenGLSurface); -#if QT_CONFIG(opengl) - setFormat(QRhiGles2InitParams::adjustedFormat()); -#endif break; case QRhi::Vulkan: setSurfaceType(VulkanSurface); diff --git a/tests/manual/rhi/multiwindow/multiwindow.cpp b/tests/manual/rhi/multiwindow/multiwindow.cpp index 0240c21a2f..f25a68c621 100644 --- a/tests/manual/rhi/multiwindow/multiwindow.cpp +++ b/tests/manual/rhi/multiwindow/multiwindow.cpp @@ -268,17 +268,15 @@ Window::Window(const QString &title, const QColor &bgColor, int axis, bool noVSy switch (graphicsApi) { case OpenGL: { -#if QT_CONFIG(opengl) setSurfaceType(OpenGLSurface); - QSurfaceFormat fmt = QRhiGles2InitParams::adjustedFormat(); // default + depth/stencil - fmt.setSwapInterval(noVSync ? 0 : 1); // + swap interval + QSurfaceFormat fmt = QSurfaceFormat::defaultFormat(); + fmt.setSwapInterval(noVSync ? 0 : 1); setFormat(fmt); -#endif } break; case Vulkan: -#if QT_CONFIG(vulkan) setSurfaceType(VulkanSurface); +#if QT_CONFIG(vulkan) setVulkanInstance(r.instance); #endif break; @@ -511,6 +509,10 @@ int main(int argc, char **argv) qDebug("Selected graphics API is %s", qPrintable(graphicsApiName())); qDebug("This is a multi-api example, use command line arguments to override:\n%s", qPrintable(cmdLineParser.helpText())); + QSurfaceFormat fmt; + fmt.setDepthBufferSize(24); + QSurfaceFormat::setDefaultFormat(fmt); + #if QT_CONFIG(vulkan) r.instance = new QVulkanInstance; if (graphicsApi == Vulkan) { diff --git a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp index 6546d122d2..ef690ca828 100644 --- a/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp +++ b/tests/manual/rhi/multiwindow_threaded/multiwindow_threaded.cpp @@ -692,6 +692,10 @@ int main(int argc, char **argv) qDebug("Selected graphics API is %s", qPrintable(graphicsApiName())); qDebug("This is a multi-api example, use command line arguments to override:\n%s", qPrintable(cmdLineParser.helpText())); + QSurfaceFormat fmt; + fmt.setDepthBufferSize(24); + QSurfaceFormat::setDefaultFormat(fmt); + #if QT_CONFIG(vulkan) instance = new QVulkanInstance; if (graphicsApi == Vulkan) { diff --git a/tests/manual/rhi/multiwindow_threaded/window.cpp b/tests/manual/rhi/multiwindow_threaded/window.cpp index 9c0d5bfdf9..ea098b7f37 100644 --- a/tests/manual/rhi/multiwindow_threaded/window.cpp +++ b/tests/manual/rhi/multiwindow_threaded/window.cpp @@ -16,14 +16,11 @@ 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; diff --git a/tests/manual/rhi/shared/examplefw.h b/tests/manual/rhi/shared/examplefw.h index 33a7e4ea48..4f49084537 100644 --- a/tests/manual/rhi/shared/examplefw.h +++ b/tests/manual/rhi/shared/examplefw.h @@ -135,10 +135,7 @@ Window::Window() // Tell the platform plugin what we want. switch (graphicsApi) { case OpenGL: -#if QT_CONFIG(opengl) setSurfaceType(OpenGLSurface); - setFormat(QRhiGles2InitParams::adjustedFormat()); -#endif break; case Vulkan: setSurfaceType(VulkanSurface); |