mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qtquick3d: fix native build
Change-Id: I8909dc26c1b4f63590bed794bd596b34c05cf363 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
parent
bab800db57
commit
1f8fa2d766
30
recipes-qt/qt6/qtquick3d/0001-Fix-no-opengl-build.patch
Normal file
30
recipes-qt/qt6/qtquick3d/0001-Fix-no-opengl-build.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
From c4524ab78d72ddaf9c8b5bfda3191f24005b713b Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Fri, 1 Apr 2022 11:20:29 +0300
|
||||
Subject: [PATCH] Fix no-opengl build
|
||||
|
||||
Amend f6f8f6d003b19fe6460346a61f224c8edfc031e3 to fix
|
||||
build when configured without opengl.
|
||||
|
||||
Fixes: QTBUG-102209
|
||||
Change-Id: I8b88d5a697b01016976048df6811adbcfb8d6170
|
||||
---
|
||||
src/runtimerender/qssgrendershadercache.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/runtimerender/qssgrendershadercache.cpp b/src/runtimerender/qssgrendershadercache.cpp
|
||||
index fcd17f29..6bc6bc74 100644
|
||||
--- a/src/runtimerender/qssgrendershadercache.cpp
|
||||
+++ b/src/runtimerender/qssgrendershadercache.cpp
|
||||
@@ -128,9 +128,11 @@ static void initBaker(QShaderBaker *baker, QRhi *rhi)
|
||||
case QRhi::OpenGLES2:
|
||||
{
|
||||
QSurfaceFormat format = QSurfaceFormat::defaultFormat();
|
||||
+#if QT_CONFIG(opengl)
|
||||
auto h = static_cast<const QRhiGles2NativeHandles *>(rhi->nativeHandles());
|
||||
if (h && h->context)
|
||||
format = h->context->format();
|
||||
+#endif
|
||||
if (format.profile() == QSurfaceFormat::CoreProfile && format.version() >= qMakePair(3, 3)) {
|
||||
outputs.append({ QShader::GlslShader, QShaderVersion(330) }); // OpenGL 3.3+
|
||||
} else {
|
||||
|
|
@ -15,6 +15,7 @@ ASSIMP_BRANCH = "qt6_assimp"
|
|||
|
||||
SRC_URI += " \
|
||||
${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
|
||||
file://0001-Fix-no-opengl-build.patch \
|
||||
"
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-native"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user