summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qt3dv6.2.8-lts-lgpl6.2Qt Submodule Update Bot2024-03-261-3/+3
| | | | | Change-Id: I19ed59c335bd334b4fc0bf3540d53cf7148c7314 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into ↵Tarja Sundqvist2024-02-2214-27/+44
|\ | | | | | | | | | | | | | | | | tqtc/lts-6.2-opensource Conflicts solved in a file: dependencies.yaml Change-Id: I7436e415d509594cb8a50a60cc0228c6d32e048e
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-03-291-3/+3
| | | | | | | | | | Change-Id: Ic8b65c99777dbc1d33f4581b7758091d9f8d0de8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-03-271-3/+3
| | | | | | | | | | Change-Id: I3ae665f642c7ced1947cc54eaf78ff534e4b0747 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-03-221-3/+3
| | | | | | | | | | Change-Id: I96e09f81e3b90e0cc6e16350e8a59c6c8b00e763 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-03-161-3/+3
| | | | | | | | | | Change-Id: Id989e9c312c815df770f560f865aa1bd0606684a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-03-131-3/+3
| | | | | | | | | | Change-Id: Iba701a2c8685084de9bc3ca778bead3b24433cb5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-03-101-3/+3
| | | | | | | | | | Change-Id: Id5552015faa19e9bdc9a393bba3c28cbf3482d69 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-02-271-3/+3
| | | | | | | | | | Change-Id: I3f20a65995e12ccb9dcfe3b225ab1ac4e2941539 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-02-211-3/+3
| | | | | | | | | | Change-Id: I125f94029eda1892e9399f41e7e34b65643e3d4a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-02-161-3/+3
| | | | | | | | | | Change-Id: Ic8ffd0eb5fcc55544c67a49347c4d6107eb92cb1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * QText2DEntity: fix QTextureAtlas parenting that could lead to crashesPaul Lemire2023-02-142-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> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * 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>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-02-101-3/+3
| | | | | | | | | | Change-Id: I525817e61e9de65003a4525d43b97c369e265116 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-02-071-3/+3
| | | | | | | | | | Change-Id: I807436ac4041069b4a3a23e448d6cd26f4097533 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-02-031-3/+3
| | | | | | | | | | Change-Id: I8d7bd0e81ba7a927aa5a77a57aed125ea443d52c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-01-311-3/+3
| | | | | | | | | | Change-Id: Iaa362823f6687f56689a85a69f089e2b0aa08f7c 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 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-01-261-1/+1
| | | | | | | | | | Change-Id: I4c4782b4a75cb72ad32afcbea266813380d8a772 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-01-181-3/+3
| | | | | | | | | | Change-Id: I4590c3d785f4856cd6b75ccd4851a073e6c88aa7 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 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2023-01-031-3/+3
| | | | | | | | | | Change-Id: I377c0a97c3c844de855b2fc1ee5c5d0874daeb16 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-12-281-3/+3
| | | | | | | | | | Change-Id: I429c139ffa6135888f6a6c2b520381bf8c397d7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-12-231-3/+3
| | | | | | | | | | Change-Id: Id546fbcf5756dae0a0dbfcf6e48543a3840fcbb7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-12-201-3/+3
| | | | | | | | | | Change-Id: I94b8bbd94f7ead3d72f6baeff4a48844f9e51753 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * tst_pickboundingvolumejob: fix signed/unsigned mismatchMarc Mutz2022-12-171-2/+2
| | | | | | | | | | | | | | | | Amends fd7536a6e4cfaee8e52c9c6411601aed745fe5f6. Change-Id: Ib2aed78b798ea163125593319f65b123bcc4f895 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 90fb8a94b438d9aed27b8cf5f020b92891cce749)
| * tst_renderviews: fix signed/unsigned mismatchMarc Mutz2022-12-151-4/+4
| | | | | | | | | | | | | | | | | | Amends f672753556cf28d44f864457dc6338a55e2e0ed4. Change-Id: I5c3e99a033cead91a03ab468b4c44b687422baac Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit dfcd9f8b5aa56973e4a000331e51c4e9386ec78d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * tst_filtercompatibletechniquejob: fix signed/unsigned mismatchMarc Mutz2022-12-151-1/+1
| | | | | | | | | | | | | | | | | | Amends 914752257634dede18cc5079f2a506b699744058. Change-Id: I0320fb3b5e44e10e6ee106bbcb79322323cc3d12 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit cc81a2f1c2cb5d4c1da4a03d8fde90230584edd1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-12-151-3/+3
| | | | | | | | | | Change-Id: I74c38f181d7b2b7244605f7a29dffe59392e1bdf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-12-111-3/+3
| | | | | | | | | | Change-Id: I211862ae9096b423c263b342efd39319f6f27fe6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Bump version to 6.2.8Tarja Sundqvist2022-12-112-2/+2
| | | | | | | | | | Change-Id: Idbb6900e9f5e4b9dae24ed555f6cafa57b35e338 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * cmake: make qt3d-vulkan feature depends on vulkan in QtGuiLiang Qi2022-12-091-1/+1
| | | | | | | | | | | | | | | | Fixes: QTBUG-109203 Change-Id: Ib707a6d09cf95e9eb819205660bb185fba398705 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit d270d8639db178219e2649625526c967b3e451d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Doc: Fix paths for Files property in qt_attribution.json filesKai Köhne2022-12-071-1/+1
| | | | | | | | | | | | | | | | | | qtattributionsscanner expects file paths to be separated by a space. Change-Id: I983870ea403983f2fc32bf0d986e76235d74e497 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit f3f55a6aa8697c62a154e6331dea970a9ea37cc3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-12-051-3/+3
| | | | | | | | | | Change-Id: I77e20e550c829492592855af3378ad66ff5412da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-291-3/+3
| | | | | | | | | | Change-Id: Ia2ba8c3b480baec895e4a8ec7af0ad59d172a270 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qt3dv6.2.7-lts-lgplQt Submodule Update Bot2023-10-311-3/+3
| | | | | | | | | | Change-Id: I06f5f8dce1ace3d8e3b4564b14dc483a56948e17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qt3dQt Submodule Update Bot2023-10-111-3/+3
| | | | | | | | | | Change-Id: I0de25cb60773fc5f8b40e841065deff34225d056 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-6.2.7' into ↵Tarja Sundqvist2023-10-0320-43/+226
|\ \ | | | | | | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Ic08a289df5bcfc314354101e9941f107f29fbe07
| * | Update dependencies on 'tqtc/lts-6.2.7' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-281-3/+3
| |/ | | | | | | | | Change-Id: I94a67f1f5eb6ec896126030d81593e635c9f9184 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * OpenGL SubmissionContext: reset defaultFBO every time we begin drawingPaul Lemire2022-11-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We wrongly assumed that the default FBO id would remain constant over time once the submission context had been initialized. However it appears that when using Qt3D with a QQuickWidget/QQuickRender control with offscreen surfaces, the default FBO might change over time as the offscreen surface might get recreated. To compute the proper render target size, we rely on comparing the default FBO id against the active FBO id being used at various times in the rendering process. If the default FBO has changed since initialization (due to an offscreen windows recreation on a resize for example), we run the risk of having invalid comparisons between the default FBO and current active FBO. This results in possible erronous render size values when going through SubmissionContext::renderTargetSize. This can lead to occasional flickering or the scene not rendering (getting a reported size of 1x1) when resizing a QQuickWidget holding a Scene3D. Change-Id: I18371e8e19213c472bdb64a6f339ee0941e5cb3d Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 0e5099cc5afaef043058a6b3b459aa7e815ddf9c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-241-3/+3
| | | | | | | | | | Change-Id: I627b524c8f1db807630b33b20a06f090408673f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Coin: Add alias to non tqtc moduleToni Saario2022-11-231-0/+1
| | | | | | | | | | | | | | | | This changes the module name in Coin to match what is run in qt5 integration and allows reuse of artifacts. Change-Id: Icaa6539c4086053dbaed78ddca77eb2561f29209 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-181-3/+3
| | | | | | | | | | Change-Id: Icb2b596e3fa898c15afffc7bcd3f00d1085f8d27 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-141-3/+3
| | | | | | | | | | Change-Id: I15c4c6dd29ccb7671274361698b0c6478d5bd725 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-121-3/+3
| | | | | | | | | | Change-Id: I3c2f2916b6af7e9c3ed305e7f9acfa61edfc4bc2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-091-1/+1
| | | | | | | | | | Change-Id: I50cc04003728ba0bd47d516423a414bbbe09bb7f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-081-3/+3
| | | | | | | | | | Change-Id: Ie6a6d1b38403085b91ec8ede93d6e9e9b4651411 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qt3dQt Submodule Update Bot2022-11-031-3/+3
| | | | | | | | | | Change-Id: I47d30780c12592b98f0665e9bba4cf749b2799ae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * ShaderParameterPack: check we only store a single UBO/SSBO per BlockBindingPaul Lemire2022-11-022-2/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we cache ShaderParameterPacks over multiple frames, we need to ensure that we check that when setting a UBO/SSBO we don't already have an entry matching the block index. If that's the case we should simply replace the entry rather than append a new entry. Failing to do so results in appending a growing number of UBO entries for the same block. Change-Id: Ie7535a80b9426ce2fd5ab6ebe16ea71bd7447750 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit f672753556cf28d44f864457dc6338a55e2e0ed4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * OpenGL graphics helpers fixesPaul Lemire2022-11-026-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | - Adjust warning message to match GL version they are used against - Correctly call glDrawElementsInstancedBaseVertexBaseInstance on GL 4 - Overload glDrawArraysInstancedBaseInstance to call glDrawArraysInstanced on ES 3 Change-Id: I54e054cc636327e424e4732362dfa2d79562d958 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 7678db1b8ac5a75950b70daf60baa7b42fd826d1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 23:15:09 +0000