summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.6.2' in qt/qt3dv6.6.26.6.2Qt Submodule Update Bot2024-02-101-4/+4
| | | | | Change-Id: Iaffb1f42abea1ef5efc0e2a43fc940251aac8f67 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qt3dQt Submodule Update Bot2024-01-311-4/+4
| | | | | Change-Id: Ib6d2eb3c3a28093a8ce487ab34d2486049afae5d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qt3dQt Submodule Update Bot2024-01-301-4/+4
| | | | | Change-Id: Ie1a114ed44f824778d86b9d05374dcbe550bf9bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qt3dQt Submodule Update Bot2024-01-271-4/+4
| | | | | Change-Id: I7262862e7f256eb8e21247d76d7a9b6d91944191 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qt3dQt Submodule Update Bot2024-01-261-4/+4
| | | | | Change-Id: Ied2a64152b18c1d6ec691babbb02f0529a45fbf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6.2' in qt/qt3dQt Submodule Update Bot2024-01-241-4/+4
| | | | | Change-Id: I9d91e9afcbef63a9e21383c2fbf7b32b5750f611 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2024-01-221-4/+4
| | | | | Change-Id: I0012ada0f54a02aa6c15949d5fbf1c78edd910a1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2024-01-181-4/+4
| | | | | Change-Id: Ic306124adb9e7d040a10b46284a59c90f7feb3c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2024-01-171-4/+4
| | | | | Change-Id: I46c04772313428fdfaa42a04aae04acde3780ce3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Enable uniform buffer for RHI compute shadersPhilip Schuchardt2024-01-161-2/+3
| | | | | | | | | | | | | | This enables uniform buffers for all rendering stages including the compute stage. [ChangeLog] Enable uniform buffer for RHI compute shaders Fixes: QTBUG-119659 Change-Id: I7c83bc9bf33cef4b925b52b7f4d6cde79e7e62e3 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 7dd1fe963d1b27d880f302ccd09e5b71447bd899) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 51cfb893c59c41064c8b09e1172f7b311dba8030)
* Scene3DMaterial shaders: provide versions for GLSL 120 and 130Paul Lemire2024-01-163-2/+2
| | | | | | | | | Pick-to: 6.5 Change-Id: Ia9aee43e03ed9efb8538e6cd7b25fa06fa5cb97d Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 02fd5255ba03c1f1a5172ec2c9cc917d2e738079) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f8743acf7bed1d5667626cc8b4fa7ee075c70b90)
* Fix issue with camera shaking with large offset valuesMike Krus2024-01-167-7/+40
| | | | | | | | | | | | | | | | | If the case where the scene uses a QCamera, and that that camera is not child of a node that has a transform component, the renderview will use the viewMatrix computed from the frontend. In all other cases, it will continue to recompute the viewMatrix based on parameters of the camera and apply parent transformations. Task-number: QTBUG-69463 Pick-to: 6.5 5.15 Change-Id: I8300a4fd82c527ad3412e81b96633409794b3b1f Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit f8b1ca7bf17e53aa055e1963f60bb4fe6794e527) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 484f1ae5edd0d1510f49d31517752b421a3b323c)
* Fix the creation of backend nodes if using the parent entity constructorAurélien Brooke2024-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On an already running simulation, when adding entities with the constructor taking a parent node, no backend node was created if a component was previously added to the tree with QEntity::addComponent(). In QEntity::addComponent(), we call _q_ensureBackendNodeCreated() on the component, creating the backend nodes of the whole tree, which marks them with m_hasBackendNode = true. Then, when we try to create a new entity by using the constructor which takes a parent entity (e.g. `auto positions = new QAttribute(entity);`), we effectively call NodePostConstructorInit::addNode(). But since the parent node is still in the m_nodesToConstruct queue (we didn't return to the event loop yet), the function did not queue the new entity for backend node creation. To fix this, allow the new entity to be added in the creation queue, even if the parent in the queue has already been created itself (m_hasBackendNode == true). * The bug does not happen when creating the whole tree in advance and then calling setRootEntity(). * It also does not happen if not calling QEntity::addComponent(), because then the parent backend node is not created, so it will create its child one automatically once itself is created. * Finally, not giving a parent node and explicitly calling setParent() later was also working. QTBUG-120964 contains an example materializing the crash, caused by the missing Attribute backend node. Fixes: QTBUG-77139 Fixes: QTBUG-100387 Fixes: QTBUG-120964 Change-Id: I908f1b5ecc2a845564d38bc634a2c645ad1a8074 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 0d4a4a9eff4fad9e81e5ca5fee441ce3bd367835) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 14264f82e3da395bcd9ff3d51fb6c491114c92c7)
* QEntity: fix a std::move-from-const in destructorAurélien Brooke2024-01-131-1/+1
| | | | | | | | | | | | The quadratic fix proposed by commit cbffb898fc3625a04a9569e232c0f6231d4d3505 was actually not doing anything because std::move() was applied to a const variable. Change-Id: Ieff6341493fd026ad45e0c3e26f0cdb4797b4a6a Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 4721805c04ef2acdb87f8b339f125b9a2ee7b392) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 2cf30109688fdfc420b85324ad417462a427fa9b)
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2024-01-091-4/+4
| | | | | Change-Id: I2ffad9c62cc97ce29488464923836c78b783b562 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-12-251-4/+4
| | | | | Change-Id: I0d9bded599a10ce13347b4a1c7ac817c70f3800b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-12-191-4/+4
| | | | | Change-Id: Idcef13e37a139d2155cf3b2b540448eeffa5134e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-12-081-4/+4
| | | | | Change-Id: I36b67e7d246497348aa89f2f5c91936c65b26cf3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-12-011-4/+4
| | | | | Change-Id: I0b39344eb0189de6c2aa31528157682ec77579d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-271-4/+4
| | | | | Change-Id: I5a7f4f714ffb655e31c96784cb786df8adc9c367 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-211-4/+4
| | | | | Change-Id: I4417a9fc1aa5d8effc6e87949d68ee6c69ce8343 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.6.2Jani Heikkinen2023-11-181-1/+1
| | | | | Change-Id: Ieddeaa019ff54d25819a9d29054fcf73c63c6c24 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-171-4/+4
| | | | | Change-Id: I90d5cb59e75aaa26bc0853bb1e6f772dc46b78c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_qmesh: fix heap-use-after-free read errors due to wrong destruction orderPaul Lemire2023-11-161-6/+7
| | | | | | | | | Pick-to: 6.5 Task-number: QTBUG-119137 Change-Id: Ia4e23cb6fa3a16160a70f5beb6963a39bdd5e80b Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit ff61fbf9cc38e82b53a5a2469e8d22975fe7d8c0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add a description to the QCylinderMesh class and qml typeAndreas Eliasson2023-11-151-0/+6
| | | | | | | | | Fixes: QTBUG-116494 Pick-to: 6.5 6.2 5.15 Change-Id: I15da4ef38aa15dedcb5456a9e5819d9e2e972ba4 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit d039de630ebf1bbd3000e5edafb78e8b22754729) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update Assimp to v5.3.1Mike Krus2023-11-156-6/+51
| | | | | | | | | Change-Id: I8049e1c38247f62f1153741c906bae7811f9735c Pick-to: 6.5 6.2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 4ae1de64317863aa3128bb6aabfc5a1187194117) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-101-4/+4
| | | | | Change-Id: If3272ff04f54da9d5d0bd8e7d6574f8cee8f07dc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-091-4/+4
| | | | | Change-Id: Icfd7e2c97bdc747f75ca34c0d50943fc384aac35 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-031-4/+4
| | | | | Change-Id: Idba9b9d4fe27628057b448c79b2efed12d10baa8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-11-021-4/+4
| | | | | Change-Id: I18d21168195d984f7a51d359cee5797cc3a3fa82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* manual-tests: restore some assets that were removed by mistakePaul Lemire2023-11-026-0/+299566
| | | | | | | | Pick-to: 6.5 Change-Id: Ica4c6735ce51f3490b70f624feece266bb862cb1 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 1c560dc14ecf7da838483f59cc4cee094f8d5e8a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-301-4/+4
| | | | | Change-Id: I4ef8186cc1cfa92886b41e3c8866b6efa9481654 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-241-4/+4
| | | | | Change-Id: I37f73cf591a79c28ebe8b993a2fad8b25a470f46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-201-4/+4
| | | | | Change-Id: Ie4cfb2a32a24851808f5cd8ef757a8da1356736f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Add missing parentheses to code snippetPaul Wicking2023-10-201-2/+2
| | | | | | | | | Fixes: QTBUG-118399 Change-Id: I88463ab2089ec423472b3bf12a168df92b6ab573 Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io> Reviewed-by: Safiyyah Moosa <safiyyah.moosa@qt.io> (cherry picked from commit 8f7e8e51ef41a68954dfd57c63eaca681cb62cef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-181-4/+4
| | | | | Change-Id: I06d7f987531cb9b276c094ebd16f7ed5efc5affc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-121-4/+4
| | | | | Change-Id: I2c97cd76404b3cc4e14631c8e901481a875385b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix Race Condition in NodePostConstructorInit::processNodesPhilip Schuchardt2023-10-114-6/+12
| | | | | | | | | | | | | | | This fixes QTBUG-116770. This moves m_aspectEngine to the correct thread when it's created in Scene3DItem. And prevents processNodes from being called on the wrong thread. [ChangeLog] Fix Race Condition in NodePostConstructorInit::processNodes Fixes: QTBUG-116770 Pick-to: 6.5 Change-Id: Iaf47ffd99ab6f920559b596a9baa8c253c135e40 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit e275b1c286d223463409c57a7300b7ddc56df061) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-091-4/+4
| | | | | Change-Id: I86ef82cea02462b8432dc8efc5c2f187649ed61c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-061-4/+4
| | | | | Change-Id: I34c6a8ea46177f7898c92e910c456407d5322696 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AspectCommandDebugger::trim: use memmove instead of memcpyPaul Lemire2023-10-041-3/+3
| | | | | | | | | | | | Since the ranges to copy overlap, memcpy isn't safe to use, memmove is. Task-number: QTBUG-117065 Pick-to: 6.5 Change-Id: Ib4197f35c919b24ce229def0f5e154221d22357f Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> (cherry picked from commit 6a407b6e9bb24a87e7ff9434fea602029fd5ca67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't change RHI's default surface format versionBogDan Vatra2023-10-041-3/+0
| | | | | | | | | | | | | Setting the defaut surface format version to 1, on Android, it creates GLESv1 contextes instead of GLESv2. Fixes: QTBUG-114037 Fixes: QTBUG-114036 Pick-to: 6.5 Change-Id: I42fb1781d74069de00ecc10e227c558013773da0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a9a7de6af54b9e68d8bd904e9346e213a76cf8ea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-031-4/+4
| | | | | Change-Id: I9f49e4e4b27e3cb9fbfd124ae0a084b75933723e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-10-021-4/+4
| | | | | Change-Id: Idb291653c9027b2dd6f1b499ae16a5c52f31cd5b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-09-281-4/+4
| | | | | Change-Id: Ic7b30a3107378a1caac3ecdd7bca258e93a58377 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-09-261-4/+4
| | | | | Change-Id: Icca3310e2d1ee6f259f34d611b1bfffecaf8efaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-09-251-4/+4
| | | | | Change-Id: I973cae1f86654325047fc1f31beee63e8788e61b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-09-221-4/+4
| | | | | Change-Id: I525a090c8a765f31c905b176bd6c10aee68a6a83 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-09-201-4/+4
| | | | | Change-Id: Icbcb563cac53b7eee362cfab0b039013269d4923 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.6' in qt/qt3dQt Submodule Update Bot2023-09-191-4/+4
| | | | | Change-Id: I3995c4f22643ac6d25ea2d9327e49dd244d3d039 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>