summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.7.0' in qt/qt3dv6.7.06.7.0Qt Submodule Update Bot2024-03-251-1/+1
| | | | | Change-Id: Ib91599ccc4b370f29c2beaa0afbd095ee3fd934f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qt3dQt Submodule Update Bot2024-03-221-4/+4
| | | | | Change-Id: I391f1f2cbd1003aee1fa2e1b49422903eb464df5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qt3dQt Submodule Update Bot2024-03-201-4/+4
| | | | | Change-Id: Icba255f7640b41dd0ceb4944cd8e40348f52b23d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* fix stereo renderingAlexander Busse2024-03-202-17/+9
| | | | | | | | | Change-Id: I1f55f4ce10107b5d4b3f92e1cb022a0c6595186b Task-number: QTBUG-123483 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 34a079506ee9cf7fc692261aa2949a2e662ce45f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 8dadce1681e2f0cd56693012bff68f9d22ac00a4)
* Update dependencies on '6.7.0' in qt/qt3dv6.7.0-rc2Qt Submodule Update Bot2024-03-191-4/+4
| | | | | Change-Id: I057f37820e2397c5311cfe7cdde16b6a644ab71f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7.0' in qt/qt3dv6.7.0-rc1Qt Submodule Update Bot2024-03-081-4/+4
| | | | | Change-Id: I2bd7efc2c02abcecaa31a10562938a8a958d0322 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-051-4/+4
| | | | | Change-Id: I282d2da1c907d95d2f22686e35a6ab436c895907 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-031-4/+4
| | | | | Change-Id: I31efd948c21f636c15698a99c7f161096dd8c356 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-011-4/+4
| | | | | Change-Id: I50de6fe7193daece878d425f4845d47e128ad7a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-03-011-4/+4
| | | | | Change-Id: I058123df9a7380d68d5462e73f9d1e7a629931df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI: ensure there is always a valid m_currentUpdatesAurélien Brooke2024-02-281-14/+6
| | | | | | | | | | downloadRHIBuffers() needs a valid QRhiResourceUpdateBatch Fixes: QTBUG-121702 Change-Id: I22e97c028aa6b85b505b64b8f65f9a18e31ea2c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit c6e499dae2b943de4acf831be596eebc444d2315) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix crash in QPaintedTextureImage when never calling repaint()Aurélien Brooke2024-02-281-0/+3
| | | | | | | | | | | | | | | When creating a QPaintedTextureImage without calling repaint() nor resizing, Qt 3D crashes because there is not generator created. Even though it is not a normal use case, avoid crashing, by creating an empty generator in the constructor. Fixes: QTBUG-122613 Pick-to: 6.6 Change-Id: Iac5abd7d728330c5fa28e3de49a1e7ff261ace3f Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit b1767913a2f8b1e366ff426f74380fbc06f92b7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ShaderData: Atomically generate property valuesAlexander Hulander2024-02-283-12/+11
| | | | | | | | | | | | | | | | Ensure same lock is used when generating property values for ShaderData. Not doing so could cause a race condition if two different threads checked if ShaderData contained property value for a given block at the same time. Also removes unused method to avoid similary issues in the future. Fixes: QTBUG-111427 Pick-to: 6.6 Change-Id: Iadf88aeb7a440bcfd46f2a8e164403fa7d6e1713 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit c6fafcb66814c1de1fd67c1e049d94c94ce0d2f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-271-4/+4
| | | | | Change-Id: I8c431498674a18816491c01a5a1ff39ca6364318 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-231-4/+4
| | | | | Change-Id: I787bc5fc592ce7e90257955325f113eb0b603bc3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-211-4/+4
| | | | | Change-Id: Id89188df3b0585390130deffb54a0bd4afe37ebb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Move examples to '3D' categoryTopi Reinio2024-02-217-7/+7
| | | | | | | | | Task-number: QTBUG-122377 Change-Id: I674641da56e2a5c3578a81ff3236f7389e5ddd24 Reviewed-by: Jaishree Vyas <jaishree.vyas@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 5277afc2b7c6e4330293ee777fc8cb2e8ed52a5e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-191-4/+4
| | | | | Change-Id: I41096fdc1f96c38a92faa2ad351f4d166d848e8f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-161-4/+4
| | | | | Change-Id: I0ecc5613bb68fc3539cf01ec637e5810096f6646 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dv6.7.0-beta3Qt Submodule Update Bot2024-02-101-4/+4
| | | | | Change-Id: If2c5663938e70db3ef1b9ccf44b7c51c988f6c7c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* build system: fix unity buildsTim Blechmann2024-02-07117-173/+260
| | | | | | | | | | | | | | | we need to avoid polluting the global (or qt) namespace by moving the `using namespace Qt3DXXX` statements into the namespace where it's actually required. furthermore: * replace `QT_USE_NAMESPACE` with `QT_BEGIN_NAMESPACE`/`END` pair * exclude some translation units with name clashes inside anonymous namespaces Change-Id: I5301b55c6a0c7079602c759f5bde152354149880 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 06bb491354489b06998306ea9de87da92314b397) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-071-4/+4
| | | | | Change-Id: Ie3a85bcd22330bbcd841c8d35f5e261abc049f4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-051-4/+4
| | | | | Change-Id: I7d8fb27127502f9b0ed33c4607d064aac095e195 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-02-011-4/+4
| | | | | Change-Id: I7e8d2d4f7cebd5550334bab394bcafb0b980334d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* animation: silence clang warningTim Blechmann2024-02-011-2/+0
| | | | | | | | | | silence's clang's: variable 'channelIndex' set but not used [-Wunused-but-set-variable] Change-Id: Ie551ebbd7c3e49146fe0db4cc01c39be45437752 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 2477a0b1c9e6fd92d74e0f237caa1b2c9a1cbee0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* animation: silence clang warningTim Blechmann2024-02-011-1/+1
| | | | | | | | | fixes clang's: -Warray-parameter warning Change-Id: I8c1af840b37a0e83252cf64539c384fb5240ba90 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit afc99d91af4d27011c777aac101593bf1e1be04c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* bigscene-instanced-qml: set correct instanceCount value on parameterPaul Lemire2024-01-311-1/+1
| | | | | | | | Pick-to: 6.6 6.5 Change-Id: I1c059645ce9dee26784a0d4a1df6a9cb1046a02f Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 582e38a1cca63334c01fb4fff65f0d6d36c8de6f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Address API review commentsMike Krus2024-01-311-30/+14
| | | | | | | | | | Added revision number to properties added in 6.7 and made sure all slots were tagged properly. Change-Id: I558824cb22fdf8d66c1f6859c5112ea912bdc21c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 58c4843826f814556b80ce75cf36f5901e550ae6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dv6.7.0-beta2Qt Submodule Update Bot2024-01-241-1/+1
| | | | | Change-Id: I6f2d4c3ac5952d1742eb473f50d37588c34f699e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-231-4/+4
| | | | | Change-Id: Iefd97b59568718563732cd29afe23b0f24f1a9fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-201-4/+4
| | | | | Change-Id: I235263b27e0e42cd06ae06b6c0737ad2c8e46293 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-191-4/+4
| | | | | Change-Id: Ibe5ef1d99f875fae59f9d7f4ccb691e4f4302a62 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-181-4/+4
| | | | | Change-Id: I2a91852c68c82d2773b484bd6c70b1373da91d72 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-161-4/+4
| | | | | Change-Id: I4d1c76380fee166f21c74ec836e4a1a87a296c3e 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 Pick-to: 6.6 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>
* 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.6 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>
* Scene3DMaterial shaders: provide versions for GLSL 120 and 130Paul Lemire2024-01-163-2/+2
| | | | | | | | Pick-to: 6.6 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>
* Fix the creation of backend nodes if using the parent entity constructorAurélien Brooke2024-01-151-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 Pick-to: 6.6 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>
* RHI: fix the PerVertexColorMaterial shaderAurélien Brooke2024-01-131-138/+1
| | | | | | | | | | | | | | The Light struct was not conformant to the std140 layout. Use the existing phong.inc.frag code fragment to fix this and reduce code duplication at the same time. Fixes: QTBUG-115025 Fixes: QTBUG-115565 Change-Id: I70840a53fe48cab67200b09e17072ccc6a142a6a Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 4b0bb2f95da3c14aa20b610f36d9f04f6c82c8f3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI renderer: fix crash when executing a draw RV after a compute RVAurélien Brooke2024-01-131-1/+9
| | | | | | | | | | | | | | | | | | | | | RHI resource update batches are released when we pass them to beginPass() or endPass(). We must then either clear the m_currentUpdates pointer, or assign it to a new batch. The later was done after all endPass(). But we forgot to clear the m_currentUpdates pointer after beginPass(), which resulted in a crash, since we then sent the same -released- batch pointer to the following endPass(). This crash did not manifest before 6b6465032f103a084e416cbddf03f8e83191aea2 because then all batches were leaked (never released). Fixes: QTBUG-119657 Change-Id: Ic63a96fc58714099b0a4e65e495ae0a720a3823f Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 708b851eb5afcb5ae4019777b56787cce4910c8b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix ambient color contribution in Phong shaderAurélien Brooke2024-01-134-18/+34
| | | | | | | | | | | | | | | | | | The ambient color is not visible if the diffuse color is black. The ambientColor contribution is wrongly multiplied by diffuse.rgb instead of ambient.rgb. Fix the issue by adding ambientColor to the adsModel() function, and multiplying it by ambient.rgb. [ChangeLog][QPhongMaterial] Fix ambient color contribution Fixes: QTBUG-77665 Fixes: QTBUG-120241 Change-Id: I0a156eb61e0f57ff4c0d6755ff8fd750877bf33d Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 491e25e100f5eace863a6cab4b0fc5a508cae7bf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Pick-to: 6.6 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>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-121-4/+4
| | | | | Change-Id: Iffe4bc3128472221ed0cc57f24447fed1fa87366 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2024-01-091-4/+4
| | | | | Change-Id: Ic04c1502ca86cd1253ba15945a7e814491fd6c5b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2023-12-221-4/+4
| | | | | Change-Id: I5b744585e66120c9651ee383a72965e985daccff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dv6.7.0-beta1Qt Submodule Update Bot2023-12-131-1/+1
| | | | | Change-Id: I6b01fc37164b7fad54d9797102e30e4710465c69 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.7' in qt/qt3dQt Submodule Update Bot2023-12-121-4/+4
| | | | | Change-Id: I14a215490df4b97cd5751d9b7010f838c8cca548 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-12-081-4/+4
| | | | | Change-Id: I361e7283a7e3d57a48581936e6ec643a2f328462 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-12-051-4/+4
| | | | | Change-Id: Iebaf0e5b824b4cba7dd79522a85ed69518b7db30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-12-041-4/+4
| | | | | Change-Id: I2eeef3ee1f0b549f4949c9551958fe6e09f0f452 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 13:56:51 +0000