diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-08-10 08:23:34 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-08-10 16:57:33 +0200 |
| commit | b146ebf6ebbe805f0ba84b314a2b2581713a7751 (patch) | |
| tree | 27ad9c083d806a3cb31c1f97394fb88b584a16e2 /src | |
| parent | 03bf2fa5cd25a7c3ae5589bce360d2538393ff5d (diff) | |
rhi: add gl and gles2 aliases for the RHI opengl backend
This is to align with what is done in qtdeclarative
Change-Id: I25c251c4d5755c1551e158ca34e9894b077d75fc
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/extras/defaults/qt3dwindow.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index f357f95a3..56f6bd13a 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -252,7 +252,9 @@ void setupWindowSurface(QWindow *window, Qt3DRender::API api) noexcept // If the user pass an API through the environment, we use that over the one passed as argument. const auto userRequestedApi = qgetenv("QSG_RHI_BACKEND").toLower(); if (!userRequestedApi.isEmpty()) { - if (userRequestedApi == QByteArrayLiteral("opengl")) { + if (userRequestedApi == QByteArrayLiteral("opengl") || + userRequestedApi == QByteArrayLiteral("gl") || + userRequestedApi == QByteArrayLiteral("gles2")) { api = Qt3DRender::API::OpenGL; } else if (userRequestedApi == QByteArrayLiteral("vulkan")) { api = Qt3DRender::API::Vulkan; diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp index 847207419..83b053f6b 100644 --- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp +++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp @@ -548,7 +548,9 @@ void SubmissionContext::initialize() Qt3DRender::API requestedApi = Qt3DRender::API::RHI; const auto userRequestedApi = qgetenv("QSG_RHI_BACKEND").toLower(); if (!userRequestedApi.isEmpty()) { - if (userRequestedApi == QByteArrayLiteral("opengl")) { + if (userRequestedApi == QByteArrayLiteral("opengl") || + userRequestedApi == QByteArrayLiteral("gl") || + userRequestedApi == QByteArrayLiteral("gles2")) { requestedApi = Qt3DRender::API::OpenGL; } else if (userRequestedApi == QByteArrayLiteral("vulkan")) { requestedApi = Qt3DRender::API::Vulkan; |