| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I45597e7b2a3cc70e0900cc085f3d9c0046e3cd3b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I06ca070b686f5e28fb5b8f9a8e68d35b6f818d24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1286b397554712a9796ce8c5f6cdefd077cf0b56
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I18d6b4b0f34df25aee1e468111a998e6b9c7bb8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ide259d42d2b92ebf3222d78b9231ed6734dd9be2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I379d9135ddd813f33f313a617fdff64578f5a5f2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I35840f3952d12f43927ead5a2f8a99bae8b4a6b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I6735195ed1959eb02b8b2a52dda6e9678a040506
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I9d4baed19d7f5a6b0eacfb2624a8b03aa0acc1c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I8367786df514dc9dd040177fffc321f572d0d41c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I89ecb06e60b28f4b0c1ecef6cbcd60337cd45321
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ic2eec77b4881f03e6cbe6801b212eecb79f91d8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Iaeccc8b420b4516525af6a9e79d1e48cd0cd8ee6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using OnDemand, we detect whether Qt3D actually needs to render or
not. Based on that we set a flag on the Scene3DRenderer to tell it whether
it should render or not.
The subtlety lies in the fact that depending on that flag value, we will
still call Qt3D render but not at the same moment. We need to call render
to unlock the Qt3D render loop for next frame.
Therefore when we should skip a frame, we call render in
Scene3DRender::beforeSynchronize (updatePaintNode) and return early
while in the other case beforeSynchronize doesn't call render and it gets
called later in beforeRenderPassRecording. We know that the render call
in the skip frame case won't render anything.
To work correctly, we must obviously set the skip frame flag before
beforeSynchronize / beforeRenderPassRecording is called which
wasn't the case. This therefore resulted in random screen flashing as we
would end up having beforeSynchronize rely on the skip frame value for the
previous frame. This means we would end up issuing a render call in
beforeSynchronize using assuming it wouldn't render anything when it actually
did (no FBO would be bound and Qt3D would render straight to the window
...)
Also update the number of frames to render before skipping to 3 to match
Qt 5.15 and ensure we have something visible for the first time
Scene3D is launched.
Change-Id: Icc34b62a0af2ff44232b39c694a4702488a890a2
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit e2aac33d04804c3c8f4f554c206a8cb9dd14611e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Disable the examples that use QtMultimedia as they haven't been ported
to QtMultimedia from Qt6
- QTextureDataUpdate forward header doesn't seem to be generated
- Add QuickWidgets in the find_package call so that we can later check
if it is actually available
Change-Id: I98d000e839dd0cb0aad862b66bfe8b9725a13744
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit aee00ddfb3650325df8f67b68885828b0669a017)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
syncqt doesn't find the class name if the namespace line doesn't end
with {.
Change-Id: Icf30464ed0ecb9ce84d6c62c04edfc5d374ed26f
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit df4665a61fc84b6d6a952034c7d758394ebc1767)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-107694
Change-Id: I4028dc107427c955342903239d4d80674e7109e4
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 0f1c9494899e94d86785b12c8c60743d2e829a58)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is a risk that the front-end QSceneLoader node has been destroyed
by the time the LoadSceneJob completes. The postFrame() would then do
nothing, and the m_sceneSubtree pointer will be forgotten, leaking the
whole tree. This can happen in real life when loading very large scenes.
To ensure that we cannot leak the scene tree, use strict pointer
ownership with std::unique_ptr.
Change-Id: Ie2281bc178fc8793bab967a13ea8d30aa46268a0
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit be8b6796c17cd1a616975bbd24f7a0cead725a48)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I91cc6e420e16bbc64a29485c88702277186b2a52
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Amends fd7536a6e4cfaee8e52c9c6411601aed745fe5f6.
Change-Id: Ib2aed78b798ea163125593319f65b123bcc4f895
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 90fb8a94b438d9aed27b8cf5f020b92891cce749)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Sometimes the shader manager returns a nullptr when fetching the shader from a handle, so the return value needs to be checked before it is accessed.
Change-Id: Ia021cd8f22ceb2626a7a2734b7e346fbcc8e0301
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit bffdaabaa5cd9d7fdc64e4124817b504319708e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Shaders or the QShaderProgramBuilders may not exist in the managers
anymore by the time we arrive in
Renderer::sendShaderChangesToFrontend(). This happens when Qt3D shuts
down.
To fix this, check the returned values by the managers.
This is similar to the existing patch for the OpenGL renderer:
Ia021cd8f22ceb2626a7a2734b7e346fbcc8e0301
Change-Id: I322bf2524016c1f98433891ad230b65272fabbdd
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 643d7889cc39f5410b9ccf64c05db0f7f6cc51fc)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Renderer seems to already take care of deleting the abandoned
shaders thanks to the APIShaderManager::purge() method. However, when
Qt3D is shut down, there remain active RHIShaders in the
RHIShaderManager::m_apiShaders, that nobody deletes.
To fix this, in the RHIResourceManagers, delete the remaining RHIShaders
as we do with the other RHI resources.
Change-Id: Iccc5470831eb7df0e120db6864fae425005c6919
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 1fe1c5a3752d1d56e78fdeb95842520d83940e52)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Scene3DItem::updatePaintNode(), in the Render thread, we try to set
the parent of the aspect engine being deleted to nullptr. This was
triggering an assert in QCoreApplication::sendEvent(), since the aspect
engine lives in a different thread, the Main thread.
Don't trigger this assert by avoiding to send ChildAdded/ChildRemoved
events when reparenting the aspect manager, thanks to the
QQml_setParent_noEvent utility.
Change-Id: Ic816701ee65654f7b18b4998c54feb4840af0a14
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 63a9c3e314364765437f641454637611c2479672)
|
|
|
|
|
|
|
|
|
|
|
| |
The multithreaded job doesn't check the visited bounding volumes for
validity before adding them to the list to process further. This leads
to crashes, namely nullptr-dereferences.
Fixes: QTBUG-108405
Change-Id: I16a7c008c7ac4f04be40bdbba05d8c745c1c825e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 23a0432451cab1e434df0efda391dbeb4790e9f0)
|
|
|
|
|
| |
Change-Id: I4b540334dfd5be26df294f13fa2ce6151be83804
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1f593ab02d7c143c9fe493a72e57e4d5c9d00657
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
It's flaky ...
Task-number: QTBUG-107693
Change-Id: I67cbb5ef8800f5c29e33ae17241b04b3af0ed067
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 4e728a2d3248b7c068b0c9b7cf1e38b3493bc3d6)
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: Id06318bfa759e14a16a988b7424660fb2709d873
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Iaa4793e4b7b5ac4c00faa55aa82b97cd3e20a040
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Fixes: QTBUG-109203
Pick-to: 6.4 6.2
Change-Id: Ib707a6d09cf95e9eb819205660bb185fba398705
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
qtattributionsscanner expects file paths to be separated by a space.
Pick-to: 6.2 6.4
Change-Id: I983870ea403983f2fc32bf0d986e76235d74e497
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I914ccc09297ac6283d7cf24d5afc96ebdaf294d0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
| |
Change-Id: I72a81bf30af86ab2e405fc0092ff48a2a98a6034
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Fix "Assigning instead of Comparing" in
tst_QResourceManager::heavyDutyMultiThreadedAccess()
Task-number: QTBUG-107693
Pick-to: 6.4
Change-Id: I018bf83dc7a3cc9d6faa654a73b2d460c3e4498a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: Idf9bb93e10d4769af0713004862ac6253dffac76
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|