summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.5.0' in qt/qt3dv6.5.06.5.0Qt Submodule Update Bot2023-03-281-2/+2
| | | | | Change-Id: I337e0b8f5f3fe9e2fafa3df87ab6a42efea4e7df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-261-4/+4
| | | | | Change-Id: Ifefecd14b5401f12f29983537cdd2296446eb5d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-251-4/+4
| | | | | Change-Id: I825753ad512ba348e9a0e2c3779d8a11aaffde38 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-221-4/+4
| | | | | Change-Id: I179add7ce9d1bc3d3095dd30db173080719cc591 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Restore missing assetsMike Krus2023-03-2055-186/+247724
| | | | | | | | | | Got removed erroneously when moving stuff to manual tests. Task-number: QTBUG-111980 Change-Id: I66cd16ea570b77825987a9297d317e03a0789d67 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 437267f14978b95ccde2589cf5f0b3dcf2e1be2c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dv6.5.0-rc1Qt Submodule Update Bot2023-03-141-4/+4
| | | | | Change-Id: Id404d1c4f68ed13264a1195a96ae6fc8abbfa527 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-131-4/+4
| | | | | Change-Id: I60a6508744846440c08a8ca2b28d628776c64fae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-111-4/+4
| | | | | Change-Id: I001ece04f5e87b07959790148b449fca63ff52cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-091-4/+4
| | | | | Change-Id: I0f47e0bf07c3bcced8bf2882da98af565871557d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5.0' in qt/qt3dQt Submodule Update Bot2023-03-061-4/+4
| | | | | Change-Id: Icdbcc8f04a9936890df86550dd51f89ddd5b411f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-03-011-4/+4
| | | | | Change-Id: I9cad60bb0af6d92705307a8c8d5fa5c16588326a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge both controls based examplesMike Krus2023-03-0110-4447/+38
| | | | | | | | | Can toggle underlay mode from main.cpp. Change-Id: Id3ef156b0df9b30dd9d7d3620a2878e70434d69b Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 6c1155f6ac4e8baa554a55b915eca0add4030d07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move some examples to manual testsMike Krus2023-02-27377-305266/+471
| | | | | | | | | | | Reduces the maintenance burden. Also fixed a few issues when moving code. Change-Id: I647f0c1a215f27a0e834d328ca64cfb570639b04 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 00d139e39f675c32d6b8202900a0d8d5706ee8e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Exclude Assimp from Unity BuildAmir Masoud Abdol2023-02-261-0/+1
| | | | | | | | | Task-number: QTBUG-109394 Change-Id: Ifb061194f34ffdeded0e264f870f2d8328f2f9e7 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 3f35ee5b3652582968adb57c5042a29a458f22a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OpenGL SubmissionContext: reset m_renderTargetFormat for default FBOPaul Lemire2023-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | We rely on m_renderTargetFormat when doing render capture to know in whick internal format the currently bound FBO is. m_renderTargetFormat is reset once per surface change based on the QSurfaceFormat. However, when using custom RenderTargets, it gets overwritten in the call to SubmissionContext::activateRenderTarget which happens for each RenderView. If we switch back to the default FBO in a RenderView that follows one using a custom RenderTarget, both using the same surface, we failed to reset the m_renderTargetFormat and it would mistakenly remain to the value set for the custom RenderTarget. If a RenderCapture were to happen at that stage, this would lead to crashes as we would compute the capture buffer assuming a format that doesn't match that of the current FBO. Change-Id: I5c722f20857b23b5696617065c8f50406e10aea9 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 77823b3b678a586f90d1211fa27dddfbf1fe4e71) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-02-241-4/+4
| | | | | Change-Id: If11cb1c774f7d3a211cd7df3964d39fd21733120 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove scene2d example and manual testMike Krus2023-02-2316-4814/+0
| | | | | | | | | Not supported in Qt6 Change-Id: Id33603d3b88e0eda1ae27e6ed4b8d08e2e0c91c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit d1e1ccc8f92b12779a1adab853202bc48f8a1cad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TriangleCollisionVisitor: perform intersections tests in local spacePaul Lemire2023-02-211-11/+9
| | | | | | | | | | | | Rather than multiply each triangle vertex by a mat4 to bring them to world space (which is actually costlier than the actual intersection test), we compute a local ray once and use it to test against the local vertices. Change-Id: I4de9da278186f8214c32be394beb09daa9bc4914 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 675c2b852869b8b6126f380148d9e0cfe6487506) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dv6.5.0-beta3Qt Submodule Update Bot2023-02-171-4/+4
| | | | | Change-Id: I1ce26a7a9804a35b0cc8ebe6632eb3b3aa95584d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QDistanceFieldCache: fix QTextureAtlas dangling pointerPaul Lemire2023-02-142-3/+9
| | | | | | | | | | Note: already merged in 5.15 Change-Id: If968714f1ca4869e9c607224b537e355b4a6f0dd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit b7e398620a5b467e5205722da5314938d1430f8e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Retire the qt_parse_all_argumentsAmir Masoud Abdol2023-02-103-3/+3
| | | | | | | | Task-number: QTBUG-99238 Change-Id: I5287ffb82104feb44fdf58383bf0a4766b066a6c Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 64696b16afe75e54d24792ffdf5e08f6a559523c) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-02-101-4/+4
| | | | | Change-Id: If6711c8a2eef73aac10e783c4c543845f8c89bb0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add some exclusions for CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-105-0/+15
| | | | | | | | | | | | QtGui headers referencing QTransform clash with source files using namespace Qt3DCore. Task-number: QTBUG-109394 Change-Id: I17a4571ef4a69e1133b96442c309cd1f5f922a0c Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d0b49441d348b60a87f845b2ad14a696021f605b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* quick3drender plugin: Disambiguate meta type id constantsFriedemann Kleint2023-02-102-6/+4
| | | | | | | | | | | | Make them function-local to prevent clashes in CMake Unity (Jumbo) builds, Task-number: QTBUG-109394 Change-Id: I3c42d2b2f45f5aef5f63ced4f68911d6d34a2884 Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 8a0d1556600e8763e14bb0a9d3cd1a778acded3d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QText2DEntity: fix QTextureAtlas parenting that could lead to crashesPaul Lemire2023-02-102-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | We rely on a DistanceFieldFont object to manage QTextureAtlas that hold the glyphs. The DistanceFieldFont/QTextureAtlas are supposed to be parented by the scene root to ensure that a QTextureAtlas lives as long as possible. DistanceFieldFont/QTextureAtlas are stored in a cache global to the scene to minimize the use of resources. When adding text elements, we can reuse atlases since the cache is global to the scene and only destroy an atlas (and remove it from the cache) when we know no more glyphs are referencing it. However we were mistakenly passing a null parenty to DistanceFieldFont instace of the scene root. This resulted on the QTextureAtlas not being parented by the scene root but rather by the first DistanceFieldRenderer to use the atlas. This meants that if the DistanceFieldRenderer were to be destroyed, so would the atlas (yet it would still be referenced by the glyph cache leading to crashes). Change-Id: Id84f6a651b162a4bb3c571b11388fd2429b231de Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit b1a135c547f38db0b2ce6b7bc4c4cccc43ef87d3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qspritesheetitem_p.h: Fix include guardFriedemann Kleint2023-02-101-3/+3
| | | | | | | | | | | | It clashes with qspritesheetitem_p.h. Task-number: QTBUG-109394 Change-Id: I551f09cd5ee29696711b9e1ea9b3b1a96e84c0c6 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 99a41d0d3f05699d14a1bac5b408ec0872901d38) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix warnings about fields anonymous namespacesFriedemann Kleint2023-02-101-8/+5
| | | | | | | | | | | | | | Remove anonymous namespace, fixing warning: qsgareaallocator.cpp:27:8: warning: QSGAreaAllocatorNode has a field QSGAreaAllocatorNode::splitType whose type uses the anonymous namespace [-Wsubobject-linkage] which occur in CMake Unity (Jumbo) builds. Task-number: QTBUG-109394 Change-Id: Ieb575215dad57df299e3ea11cc9f1504f311fada Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit f0eb452a19c8a77ed3dd9f0837db1bfa3bca3ede) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 3DCore: Remove using namespace Qt3DCoreFriedemann Kleint2023-02-106-9/+12
| | | | | | | | | | | | It causes clashes in CMake Unity (Jumbo) builds (3DCore::QBufferPrivate vs QBufferPrivate). Task-number: QTBUG-109394 Change-Id: Ibb8a8f37b5da3531daeca1d82aef892d253ece7f Reviewed-by: Inho Lee <inho.lee@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 3e6ef0e451016c07a6cdf24c733c1732d1343e78) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QPaintedTextureImage: fill image with transparency by defaultPaul Lemire2023-02-101-0/+1
| | | | | | | | | | Avoids having junk in the texture on the first paint call if not filling a rectangle with a QPainter. Change-Id: Icb65b6f994a9edea5132a2c54406fa0dd817bcb2 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 20d36f07fa7815fb7a05018c93602932e600397b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove Qt6 QT_VERSION checks from the code basePaul Lemire2023-02-1081-658/+1
| | | | | | | | | | | Those are left overs from the Qt 5.15 to Qt 6 port. Now that both code based have diverged, there's no much point in keeping those checks. Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit c889af388062bbee6e52e68a22ac8632fb12ff02) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-02-021-4/+4
| | | | | Change-Id: I45597e7b2a3cc70e0900cc085f3d9c0046e3cd3b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-02-011-4/+4
| | | | | Change-Id: I06ca070b686f5e28fb5b8f9a8e68d35b6f818d24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-01-271-4/+4
| | | | | Change-Id: I1286b397554712a9796ce8c5f6cdefd077cf0b56 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_QAspectJob: fix -Wsign-compareMarc Mutz2023-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | std::vector::size_type is unsigned, while decltype(2) is signed. Found by Clang 15: qtestcase.h:585:34: warning: comparison of integers of different signs: 'const unsigned long' and 'const int' [-Wsign-compare] return compare_helper(t1 == t2, "Compared values are not the same", ~~ ^ ~~ tst_qaspectjob.cpp:36:9: note: in instantiation of function template specialization 'QTest::qCompare<unsigned long, int>' requested here QCOMPARE(job1->dependencies().size(), 2); ^ Make the RHS unsigned, too. Amends b70f7af20550f55e9546ff5a2192f53d6ccb62cb. Change-Id: Ia7e612de97de86946c42c104081957fbdcc67d7f Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 0a06c7d2f465d071b4b4430fe06a080da990143e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dv6.5.0-beta2Qt Submodule Update Bot2023-01-231-4/+4
| | | | | Change-Id: I18d6b4b0f34df25aee1e468111a998e6b9c7bb8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-01-131-4/+4
| | | | | Change-Id: Ide259d42d2b92ebf3222d78b9231ed6734dd9be2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix the input qualifier of the fragment shader for GLSL1.10Inho Lee2023-01-102-1/+10
| | | | | | | | | | | | | FS's input qualifier is different with VS's in GLSL1.10. If prototypes has 'headerSnippetsFrag', it will be applied for FS instead of 'headerSnippets'. Fixes: QTBUG-99019 Change-Id: I588d3f78d4ba895a9a90b20a87b92a6da9ffee18 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit d6a9ed5039ef4f1f836f5786998485ee6016b315) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-01-091-4/+4
| | | | | Change-Id: I379d9135ddd813f33f313a617fdff64578f5a5f2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-01-051-4/+4
| | | | | Change-Id: I35840f3952d12f43927ead5a2f8a99bae8b4a6b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove QT_USE_SYNCQT_CPPAlexey Edelev2023-01-021-3/+0
| | | | | | | | | Option has not effect anymore. Change-Id: Id4c720bf3c64b91bb55d922dba093eb63b4b095c Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit f17f3e388c69556c61de72a1ebb3a6d3438a46f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2023-01-021-4/+4
| | | | | Change-Id: I6735195ed1959eb02b8b2a52dda6e9678a040506 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2022-12-301-4/+4
| | | | | Change-Id: I9d4baed19d7f5a6b0eacfb2624a8b03aa0acc1c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2022-12-291-4/+4
| | | | | Change-Id: I8367786df514dc9dd040177fffc321f572d0d41c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2022-12-281-4/+4
| | | | | Change-Id: I89ecb06e60b28f4b0c1ecef6cbcd60337cd45321 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2022-12-261-4/+4
| | | | | Change-Id: Ic2eec77b4881f03e6cbe6801b212eecb79f91d8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qt3dQt Submodule Update Bot2022-12-231-4/+4
| | | | | Change-Id: Iaeccc8b420b4516525af6a9e79d1e48cd0cd8ee6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI: fix the leak of QRhiResourceUpdateBatchAurélien Brooke2022-12-202-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | There are 2 ways to dispose of a QRhiResourceUpdateBatch obtained with QRhi::nextResourceUpdateBatch(): 1) Either give it to beginPass/endPass/beginComputePass/endComputePass so it is sent to the RHI backend and then automatically released; 2) or call QRhiResourceUpdateBatch::release() if the resource update is not used for any pass. The Qt3D RHI renderer was never disposing of the QRhiResourceUpdateBatch, and could end up exhausting all the 64 batches available in the RHI: "Resource update batch pool exhausted (max is 64)", in addition to consuming a lot of RAM if the buffers or textures are large. To fix this, ensure the QRhiResourceUpdateBatch'es we allocate are always released: when requesting a new one, send the previous one to endPass/endComputePass (1), and when destroying the SubmissionContext, release the one we will not use (2). Change-Id: Ic3fb145b11a8e615c83745f560f019e6c4ee37f7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 6b6465032f103a084e416cbddf03f8e83191aea2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix scene3d-loader manual testPaul Lemire2022-12-201-1/+1
| | | | | | | Change-Id: Ifb42900deb4c9d15cded9d2486fdc8a06fbfe6bf Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 33ccbe004d7371b4de309378e01eb807954ec74f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* quickwidget-switch: make it work in a single screen setupPaul Lemire2022-12-201-1/+2
| | | | | | | Change-Id: I5f17169c106a70c38bcc29cc7758b2bb4b9ee793 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 675bb0d0922253818e3efe4a207910bbcf40d9e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add manual tests to check the use of multiple QQuickWidgetsPaul Lemire2022-12-205-0/+233
| | | | | | | | Change-Id: Ib0a9ccaeb543f91da76e479f23bc59e868fbd2c7 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit ff59b0dc9e6a88b08b615d2f8805ffd024b95785) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
View Lorry Controller Status