| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I4b6715db9542d771f79866b2d54b4d047ae4d542
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I4d7506eb4ef235a21fb4abe6b7b7aefa9bea54bd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1c954369feef496581a582b2cf7beecaf90c0184
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I05eb3b3ebc91491c6d715e9509058da04739dfc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ieeadfeb195d03a3604d6a1bb137b36009750772b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit dee62f491a761cc860e5377746264d9e2990eca2.
Adding the manual tests as 'exampledirs' makes QDoc parse the example
documentation and also adds broken entries to the examples-manifest.xml.
We do not want the examples from /tests to generate documentation or
appear in Qt Creator. Revert the change, and address the QDoc warnings
that this commit tried to fix by other means.
Change-Id: I848344ae0836e341fabda5b740162b0015f6baf1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
(cherry picked from commit a0555349e67cd420c2d8c0277b646525b0bca589)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ieddccb012cf03fb83eeae9a380725d7413f75487
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ib062dd0f7059d2133c448b51f26fd3e1ebc1df86
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I4881985f229773d9e153b0b2bc10ad106dd1f6ad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Properties' offsets are not properly set for std140 standard.
And they are not compatible to what the host machine supposes.
Since the layout can be translated differently according to the
graphics backend, it's safe to add paddings.
Fixes: QTBUG-110128
Change-Id: Ib0748f5b0476543ecd2e42252c434bcf4b371786
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit ae363c23a48b817edb4a46e067437262edb7fa86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Initialize member hasView, fixing:
==20448== Conditional jump or move depends on uninitialised value(s)
==20448== Uninitialised value was created by a heap allocation
==20448== at 0x484DE30: memalign (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
==20448== by 0x484DF92: posix_memalign (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so)
==20448== by 0x4DC9DEE: _mm_malloc (mm_malloc.h:45)
==20448== by 0x4DC9DEE: Qt3DCore::AlignedAllocator::allocate(unsigned int) (qresourcemanager.cpp:63)
==20448== by 0x4B45C7F: allocateBucket (qresourcemanager_p.h:265)
==20448== by 0x4B45C7F: allocateResource (qresourcemanager_p.h:202)
==20448== by 0x4B45C7F: getOrAcquireHandle (qresourcemanager_p.h:369)
==20448== by 0x4B45C7F: getOrCreateResource (qresourcemanager_p.h:396)
==20448== by 0x4B45C7F: Qt3DRender::Render::GeometryRendererFunctor::create(Qt3DCore::QNodeId) const (geometryrenderer.cpp:191)
Task-number: QTBUG-112914
Change-Id: I7e55a782c85cbbdd538eab0a775a5aaa0f6d4b4c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 9a21c69f67110e84c01645564cecce7099600152)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I95d28cde8a20736ecd79b36ebddbc3ecd1711eea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I423f370132d69695dfe697e1c49565db49063eb9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Without this fix, when using unity build, qt3d mixes its symbol with
qtbase, ie., `QTransform` in `src/gui/kernel/qinputmethod.h`,
and `src/gui/kernel/qscreen.h`.
Task-number: QTBUG-109394
Change-Id: Ibab5c7ec21bed20e1ca3058e586b38598d992b17
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f16575c6f1733dede8565bb3509664e9bb9d0cd5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
It compiles and runs perfectly fine.
Change-Id: Id733074567173ee9846e215687a0ab9950c9ab54
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 753efa984eb351429d56983e2ad988d1d29ef1d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I6738d980e8f9e9647c3077546b6a6395a67bcdcb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apple Clang, and clang also complains about this, and warnings like this
tend to break the unity build in certain situation. So, if possible, I
rather address them.
Task-number: QTBUG-109394
Change-Id: I8e24267a1ebfc0c3ff4f2f8afdcb7c6aed62db80
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit a8d90a776ead891b8eedf25979c6ef4cccb6fe49)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When closing a window containing a Scene3D, the aspect engine is
destroyed after the QWindow (because of delete later), so the m_obj
pointer we store inside the PlatformSurfaceFilter becomes dangling,
leading to a crash in the destructor.
Use QPointer to ensure m_obj it set null when it is destroyed.
Fixes: QTBUG-111325
Change-Id: Icf153700a5708abff4b92b14ce2f9bb12d8653eb
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 2c3ebe01cb2875bfe48af20446b8c2b62ff49382)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
OpenGL ES has different shader versions than Desktop OpenGL, which the
existing code was not accounting for.
Check if we are running OpenGL ES to choose the proper GLSL version, and
add the flag QShaderVersion::GlslEs.
This fixes errors like this when running on Android:
No GLSL shader code found (versions tried: QList(320, 310, 300, 100) )
in baked shader QShader(stage=0 shaders=QList(ShaderKey(1 Version(120
QFlags()) 0)) desc.isValid=true)
Change-Id: I6b387962e5cf48cdb0aec8ac3e8348d7847fc20a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 57f190ddfe396d61b7ed284aae263dfeedc8f666)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I263b914a2e298c2c1f979e5b06acdbb3ccfd774f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
I slightly modified the function name to avoid the collision during the
unity build.
Task-number: QTBUG-109394
Change-Id: I1f1ffedc4ecb277a377569b47ee24d4657ceebe5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2bd0f6344008626ae3971d6cc1a0e875c18c11c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I400b591ac72644dbba47590fe05be07168daa681
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I1ce5e563f4963b7522c1424a9fe7dd291952b169
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ifed24b35265835014391a34f761b57baa834695e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Some of the examples were moved from the examples dir to the tests dir
to reduce maintenance. After this move, however, qdoc cannot find the
examples.
Change-Id: Ie67d83c695504901fced4a85293ad344beafeead
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
(cherry picked from commit dee62f491a761cc860e5377746264d9e2990eca2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: Ib4ced4fa56fb038b5ee440e0f4e752b2d2570abe
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 0e66d82ec30eb1800774e121c534579181aa6d07)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I1618c75fb2b49798a86c6cbe5980a8d33ca77422
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
Those have been moved to manual tests
Change-Id: Ifede716b69b003c7523ae21ee5f9668dbad6f5a3
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 201ce3b861082e230a4a6dc52530c3a58886164d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 00d139e3 moved both images from examples to tests/manual.
This resulted in qdoc not finding the image anymore:
Warning: The file C:/dev/qt/dev/msvc-2022-amd64/qtbase/doc/qt3d/images/shadowmapping-depth.png does not exist, skipping it...
Warning: The file C:/dev/qt/dev/msvc-2022-amd64/qtbase/doc/qt3d/images/shadowmapping-qt3d.png does not exist, skipping it...
Fix this by adding a copy of the files todoc/qt3d/images.
Since this is an identical copy, git should be clever enough
to not duplicate the actual content.
Change-Id: I6e2b753946d8195e008ce812f107ce72db41a32c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 67c33648e6f444c0df0b2fb041fa10dc9946998e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I7a18e12a5baaf9a48b9ac4350d8c2a5a383f108d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The \quotefromfile command is smart enough to keep the left indentation
from the source file when it renders the code in a code snippet in a
qdoc file. This is all good when you're listing multiple code snippets
and you can clearly see the left-most-aligned code, or 'starting
point'. However, when you use \quotefromfile for a single code snippet
that is indented in the source file, the rendered code in the qdoc file
is not left-aligned - and this looks a bit odd.
Change-Id: Ie6d2445b37faa4a75749d6013001892de012a1ef
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 5859a840c3f21b36d4c7849c173c38e16ef52fd2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I2493203c8913355afcfca72366f1736e5608d2cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Icc20cd458e033ab036f23063784c4910359b0f86
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Idb17c7a8ec6f8b7af51266420de17e2c60c57d35
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I9cad60bb0af6d92705307a8c8d5fa5c16588326a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: If11cb1c774f7d3a211cd7df3964d39fd21733120
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I1ce26a7a9804a35b0cc8ebe6632eb3b3aa95584d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: If6711c8a2eef73aac10e783c4c543845f8c89bb0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|