summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qt3dHEADdevQt Submodule Update Bot2023-05-171-4/+4
| | | | | Change-Id: I907316a98c0253efb8d4daae31a677284ea52162 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-05-151-1/+1
| | | | | Change-Id: Ia39bfae04f444d8b5220bdf6bfa996967d65432b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-05-151-1/+1
| | | | | Change-Id: I6b1b2918a046afe468082ff014ce7cfb315ea0c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-05-111-4/+4
| | | | | Change-Id: I066fc7521c8b41f4f169e2b47c21dee0cda6cb65 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-05-111-4/+4
| | | | | Change-Id: Ie753a1128d069b3ff90d60efd11a67c81cc21846 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Disable the graphicshelpergl tests on AndroidVille Voutilainen2023-05-091-1/+3
| | | | | | | | | | They don't build on NDK 25, if anywhere, since Android uses GLES or Vulkan. Change-Id: I64a207a3543aa2274c28617241f9e278dd7b9aa2 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-05-021-4/+4
| | | | | Change-Id: Ic98b9ecc311b0a066adb69e342638a68fa5aa29f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Doc: Add tests/manual in exampledirs to fix broken links"Topi Reinio2023-04-291-2/+1
| | | | | | | | | | | | | | | | 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. Pick-to: 6.5 Change-Id: I848344ae0836e341fabda5b740162b0015f6baf1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-271-4/+4
| | | | | Change-Id: I6b7c6d9ce4119eb6e069ab7d41d1189bf4216df7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-251-4/+4
| | | | | Change-Id: I5974571176cdfad88db3f8516a4a135653238fa9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-201-4/+4
| | | | | Change-Id: I03d9d13afc014813a33ed9ccff9920d096eb732f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make 'struct Light' to support std140Inho Lee2023-04-201-1/+4
| | | | | | | | | | | | | 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 Pick-to: 6.5 Change-Id: Ib0748f5b0476543ecd2e42252c434bcf4b371786 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix valgrind issue in GeometryRendererFriedemann Kleint2023-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | 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) Pick-to: 6.5 Task-number: QTBUG-112914 Change-Id: I7e55a782c85cbbdd538eab0a775a5aaa0f6d4b4c Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-191-2/+2
| | | | | Change-Id: Ifecd5b722a439752d6b464d58c45596786d6314e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-181-4/+4
| | | | | Change-Id: Id44fb83edcf918701e71ef8c25eb1739e4009b70 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-141-4/+4
| | | | | Change-Id: I016059f07ddbf634810c5ecac61e88a033a29288 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Enable build of Assimp on iOS and tvOSAurélien Brooke2023-04-131-1/+1
| | | | | | | | It compiles and runs perfectly fine. Pick-to: 6.5 Change-Id: Id733074567173ee9846e215687a0ab9950c9ab54 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Resolve QTransform symbol ambiguity in unity buildAmir Masoud Abdol2023-04-137-138/+149
| | | | | | | | | | | | 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`. Pick-to: 6.5 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>
* Silence warning about unsafe sprintf, use snprintf insteadAmir Masoud Abdol2023-04-131-5/+1
| | | | | | | | | | | 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. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I8e24267a1ebfc0c3ff4f2f8afdcb7c6aed62db80 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Create materials with normal textures in Assimp importerAurélien Brooke2023-04-131-5/+15
| | | | | | | | [ChangeLog][Assimp importer] The scene importer now creates materials that support normal textures if the loaded scene has some. Change-Id: I33327d6b97207a3510f678610787f7f85a3f97da Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* PlatformSurfaceFilter: fix crash when Scene3D is destroyed after windowAurélien Brooke2023-04-131-1/+2
| | | | | | | | | | | | | | 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 Pick-to: 6.5 Change-Id: Icf153700a5708abff4b92b14ce2f9bb12d8653eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* RHI: generate GLSL shaders of correct version when running on OpenGL ESAurélien Brooke2023-04-131-15/+34
| | | | | | | | | | | | | | | | | 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) Pick-to: 6.5 Change-Id: I6b387962e5cf48cdb0aec8ac3e8348d7847fc20a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-121-4/+4
| | | | | Change-Id: Ic944716bc980e2abfd29190e9e90958c6df63621 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-111-4/+4
| | | | | Change-Id: If3726b21e39160e92554d24bba2121ef8787c9ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve duplicate symbol error for `memoryBarrierGLBitfield`Amir Masoud Abdol2023-04-112-4/+4
| | | | | | | | | | I slightly modified the function name to avoid the collision during the unity build. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: I1f1ffedc4ecb277a377569b47ee24d4657ceebe5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-051-4/+4
| | | | | Change-Id: I3ef729a1c196fb09320f5d7c50357cfff905abf9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-04-041-4/+4
| | | | | Change-Id: If5771ef55cbd61c0523761cb36f4f0bbf8364448 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Silence a type conversion warningAmir Masoud Abdol2023-04-031-1/+1
| | | | | Change-Id: I816ad2e2133a5762b4b9b1c46fd93cb0bbff0f45 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-03-281-4/+4
| | | | | Change-Id: Id829026586cbad6c832ee06be72fc984cfd6485f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add Axivion configMatti Paaso2023-03-241-0/+63
| | | | | | | Task-number: QTQAINFRA-5244 Change-Id: I02374c00d1c85bcc33eb22babeafcf5c335cceed Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* Doc: Add tests/manual in exampledirs to fix broken linksAndreas Eliasson2023-03-221-1/+2
| | | | | | | | | | 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. Pick-to: 6.5 Change-Id: Ie67d83c695504901fced4a85293ad344beafeead Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
* Doc: Remove unused imagedirsKai Köhne2023-03-201-9/+1
| | | | | Change-Id: Id7ac8d7d729ded4e4a51b0141f0eb14b18d7a6ab Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Scene3D: fix crash in setItemAreaAndDevicePixelRatio when entity is nullAurélien Brooke2023-03-201-2/+5
| | | | | | Pick-to: 6.5 Change-Id: Ib4ced4fa56fb038b5ee440e0f4e752b2d2570abe Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-03-201-4/+4
| | | | | Change-Id: I3949889e56b0b0265b7baa06e9acef5e716b5a25 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove qmake build filesMike Krus2023-03-17473-8094/+0
| | | | | | | | Except in examples Pick-to: 6.5 Change-Id: I31b06ddfc79f14dde3369518a76d57606daf939f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Restore missing assetsMike Krus2023-03-1755-186/+247724
| | | | | | | | | Got removed erroneously when moving stuff to manual tests. Task-number: QTBUG-111980 Pick-to: 6.5 6.5.0 Change-Id: I66cd16ea570b77825987a9297d317e03a0789d67 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove links to old examplesMike Krus2023-03-171-5/+1
| | | | | | | | Those have been moved to manual tests Pick-to: 6.5 Change-Id: Ifede716b69b003c7523ae21ee5f9668dbad6f5a3 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Doc: Fix missing imagesKai Köhne2023-03-122-0/+0
| | | | | | | | | | | | | | | | 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. Pick-to: 6.5 Change-Id: I6e2b753946d8195e008ce812f107ce72db41a32c Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-03-111-4/+4
| | | | | Change-Id: I714d1c50522032978dc392e2094e2f093bc644a5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-03-071-4/+4
| | | | | Change-Id: I25cecbf7c526477366c31f3f60f118cfcdb1c665 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Replace \quotefromfile with \snippet to make code left-alignedAndreas Eliasson2023-03-067-25/+21
| | | | | | | | | | | | | | 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. Pick-to: 6.5 6.4 6.2 Change-Id: Ie6d2445b37faa4a75749d6013001892de012a1ef Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge both controls based examplesMike Krus2023-02-2810-4447/+38
| | | | | | | | Can toggle underlay mode from main.cpp. Pick-to: 6.5 Change-Id: Id3ef156b0df9b30dd9d7d3620a2878e70434d69b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move some examples to manual testsMike Krus2023-02-27377-305266/+471
| | | | | | | | | | Reduces the maintenance burden. Also fixed a few issues when moving code. Pick-to: 6.5 Change-Id: I647f0c1a215f27a0e834d328ca64cfb570639b04 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Exclude Assimp from Unity BuildAmir Masoud Abdol2023-02-261-0/+1
| | | | | | | | Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ifb061194f34ffdeded0e264f870f2d8328f2f9e7 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-02-241-4/+4
| | | | | Change-Id: I1deef0fbd0f735d46aca9d559a1a61839bd4083d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* OpenGL SubmissionContext: reset m_renderTargetFormat for default FBOPaul Lemire2023-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | 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. Pick-to: 6.5 6.4 Change-Id: I5c722f20857b23b5696617065c8f50406e10aea9 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Remove scene2d example and manual testMike Krus2023-02-2316-4814/+0
| | | | | | | | Not supported in Qt6 Pick-to: 6.5 Change-Id: Id33603d3b88e0eda1ae27e6ed4b8d08e2e0c91c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2023-02-211-4/+4
| | | | | Change-Id: I14047e1d545cd04bd4fc33bd6d8c4cc50d642a19 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* TriangleCollisionVisitor: perform intersections tests in local spacePaul Lemire2023-02-211-11/+9
| | | | | | | | | | | 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. Pick-to: 6.5 6.4 5.15 Change-Id: I4de9da278186f8214c32be394beb09daa9bc4914 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* QDistanceFieldCache: fix QTextureAtlas dangling pointerPaul Lemire2023-02-142-3/+9
| | | | | | | | | Note: already merged in 5.15 Pick-to: 6.5 6.4 6.2 Change-Id: If968714f1ca4869e9c607224b537e355b4a6f0dd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
View Lorry Controller Status