From 61058758ab8621c67e62902244bea9253d0517b4 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Sat, 10 Jul 2021 23:40:45 +0100 Subject: Disable RHI Renderer by default RHI renderer use ShaderTools which is GPL licensed. This patch disables the plugin by default until Qt3D provides a suitable replacement for the dependency. To enable the RHI backend, compile Qt3D and pass parameter -DFEATURE_qt3d_rhi_renderer=ON to cmake. Unfortunate side effect of RHI backend being disabled is that when using Scene3D, the QtQuick renderer must be configured to use the opengl backend. [ChangeLog] RHI Backend is not longer built by default Task-number: QTBUG-94960 Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41 Reviewed-by: Paul Lemire (cherry picked from commit 3964b273459c2999f33d51b96afe6fb68f07d52f) Reviewed-by: Qt Cherry-pick Bot --- examples/qt3d/controlsunderlay/CMakeLists.txt | 2 ++ examples/qt3d/controlsunderlay/main.cpp | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'examples/qt3d/controlsunderlay') diff --git a/examples/qt3d/controlsunderlay/CMakeLists.txt b/examples/qt3d/controlsunderlay/CMakeLists.txt index 1b65bc755..4bd5f086e 100644 --- a/examples/qt3d/controlsunderlay/CMakeLists.txt +++ b/examples/qt3d/controlsunderlay/CMakeLists.txt @@ -19,6 +19,7 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS 3DRender) qt_add_executable(controlsunderlay main.cpp @@ -32,6 +33,7 @@ target_link_libraries(controlsunderlay PUBLIC Qt::Gui Qt::Qml Qt::Quick + Qt::3DRender ) diff --git a/examples/qt3d/controlsunderlay/main.cpp b/examples/qt3d/controlsunderlay/main.cpp index cb3928a51..a19464911 100644 --- a/examples/qt3d/controlsunderlay/main.cpp +++ b/examples/qt3d/controlsunderlay/main.cpp @@ -50,12 +50,16 @@ #include #include +#include int main(int argc, char **argv) { QSurfaceFormat format; format.setSamples(4); QSurfaceFormat::setDefaultFormat(format); +#if !QT_CONFIG(qt3d_rhi_renderer) + qputenv("QSG_RHI_BACKEND", "opengl"); +#endif QGuiApplication app(argc, argv); -- cgit v1.2.3