summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+22
| | | | | Change-Id: I88a452077a57ad716d09dd1840febf8c294b0163 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Doc: Add QT3D_REGISTER_ASPECT macro documentationPaul Wicking2018-11-062-2/+22
| | | | | | | | Also remove two '*' that ended up in the generated docs. Task-number: QTBUG-65413 Change-Id: Ia0870405f73166dbb73ee09e34e7625c51486b41 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12.0v5.12.0-beta4Liang Qi2018-10-301-0/+3
|\ | | | | | | Change-Id: I5499524c9f4553342d192d554d4455fd7933eaa9
| * Fix crash due to racecondition in renderer on shutdownChristian Andersen2018-10-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Protects access to m_renderQueue using the m_renderQueue mutex on shutdown. When a Qt3DWindow is deleted it signals the aspect thread to do early cleanup, the aspect thread calls Renderer::shutdown which in turn resets m_renderQueue. Meanwhile the render thread may be working on m_renderQueue, this leads to a double free of the front render view in m_renderQueue (and potentially other stuff). Fixes: QTBUG-69877 Change-Id: Ifd018597dbdb2f1538494932c907c63e8db9c715 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Don't trigger Q_UNREACHABLE if passed invalid render buffer formatsChristian Andersen2018-10-222-3/+9
| | | | | | | | | | | | | | | | | | | | | | Adds warning printout of the format that triggered the error. The graphics card may produce a proper image, but readFrameBuffer doesn't know how to interpret it. Additionally adds printout of the format when the code doesn't know the equivalent OpenGL ES 2.0 format. Fixes: QTBUG-66515 Change-Id: I65559f7d397a9297521ae0b1ebaf120629be3873 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Doc: Fix external link errorNico Vertriest2018-10-221-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-70910 Change-Id: Id4976cd860f824b1a73ddc8561f1709c76dc4466 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: fix broken links in qanimationcallback.cpp and qframegraphnode.cppv5.12.0-beta3Nico Vertriest2018-10-182-1/+2
| | | | | | | | | | | | | | | | | | | | qframegraphnode.cpp:217: Cannot tie this documentation to anything qcallbackmapping.cpp:104: Can't link to 'QAnimationCallback::onValueChanged()' Change-Id: I20fb3a5688c16e86c2a62201991d30f735358d76 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: Minor corrections overview pageNico Vertriest2018-10-151-11/+11
| | | | | | | | | | | | | | | | - added links - minor syntax correction Change-Id: I68f43b5a5091f402488b656a30d5fec40deae8cd Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-131-0/+1
|\| | | | | | | Change-Id: If9d27bf336dd4d22a06662a5e189ca18b2ba2e76
| * Fix notifications for QClipAnimator::clip propertyJim Albamont2018-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | Qt3DAnimation::QAbstractAnimationClip was not registered as metatype resulting in the following error when calling QClipAnimator::setClip: QMetaProperty::read: Unable to handle unregistered datatype 'Qt3DAnimation::QAbstractAnimationClip*' for property 'Qt3DAnimation::QClipAnimator::clip Change-Id: If92d781fdab5be06ce11ec88f0b3921cfbd557ff Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update plugins.qmltypesv5.12.0-beta2Kai Koehne2018-10-0915-894/+1632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by running for path in `find . -name "Makefile*" -print`; do pushd `dirname $path`; make -f `basename $path` qmltypes; popd; done in the build directory. Fixes: QTBUG-64035 Fixes: QTBUG-69259 Task-number: QTBUG-70264 Change-Id: Ib36a8e66121c310dee28b84953ca381e231139cf Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-0530-357/+631
|\| | | | | | | Change-Id: I2a92242b0d6be4f4e7f07f0f020fa6751ada9bc3
| * Fix normal calculation in MorphPhongMaterialJoni Poikelin2018-10-052-2/+2
| | | | | | | | | | Change-Id: Iad160f2d454633b558bee91b1e01c287d4202451 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Fix compilation with -qt3d-profile-jobs on AndroidPaul Lemire2018-10-051-0/+5
| | | | | | | | | | Change-Id: Id6dc461bbc61712f59484898c54a85d07fd8fc22 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Further complete missing functions on ES3 helpersPaul Lemire2018-10-044-0/+23
| | | | | | | | | | | | Change-Id: I62e83c360619a2e096401330a61a6f2602b743d2 Task-number: QTBUG-70660 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix leak with VAOManagerPaul Lemire2018-10-033-1/+8
| | | | | | | | | | | | | | Change-Id: I09f15de230c571adb580bdbb3250405f562f255b Task-number: QTBUG-70892 Reviewed-by: Juan José Casafranca <juan.casafranca@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * QChangeArbiter: fix leakPaul Lemire2018-10-031-2/+5
| | | | | | | | | | | | | | | | | | | | When all observers for a node have been removed, we should also remove its entry in m_nodeObservations hash. Change-Id: I56762bb345e6a3eba74d5174b225dc86acd17e8f Task-number: QTBUG-70892 Reviewed-by: Juan José Casafranca <juan.casafranca@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Remove unused CameraController.qml from simple-qml exampleKai Koehne2018-10-023-314/+0
| | | | | | | | | | Change-Id: Id76f8fc4d4701933e7744ff0dff837ec5e4bcc02 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
| | | | | | | | | | | | | | | | Replace the removed phong.frag with graph-based fragment shader. Task-number: QTBUG-69751 Change-Id: I196be25aff656d6934d6179e4f082430b109b2a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Add metalRoughFunction to ES3Mauro Persano2018-09-275-0/+467
| | | | | | | | | | | | Change-Id: I5ac330462bf051285dafbfa4554aa97e6657ac65 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-271-0/+9
| | | | | | | | | | Change-Id: I9a6a7ee88db5471a1c4ed88ed13c99d66b764d93 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Use GLSL texture() instead of texture2D() on ES3Mauro Persano2018-09-271-0/+9
| | | | | | | | | | Change-Id: Icfec19e5bd76f6a6ca53700a5a3705aa97763859 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Scene3D crashing on destructionMichael Dippold2018-09-273-30/+32
| | | | | | | | | | | | | | | | | | | | Moved logic accessing the Scene3DItem from the render function into an afterSynchronization call which has the main thread locked to prevent the race condition. Task-number: QTBUG-70747 Change-Id: I596d445512b5985c7dfb54d228fa0a5fcc596a27 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * QOrbitCameraController: make zoom work when pressing shift keyPaul Lemire2018-09-261-1/+1
| | | | | | | | | | | | | | Was mistakenly using yAxis instead of zAxis input value. Change-Id: Id91d04565c503ae5f286f6b433e246a1b94d6e12 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Doc: Mark deprecated Qt 3D QML types obsoleteLeena Miettinen2018-09-251-0/+14
| | | | | | | | | | | | | | | | | | | | The types will be listed on the "Obsolete QML Types" page that is linked from the "All QML Types" page. Task-number: QTBUG-69713 Change-Id: Ieff402d1cce426c0ce4b9191b8fe9b1dd02b4328 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * QText2DEntity: clear glyphrun when scene changesPaul Lemire2018-09-242-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GlyphRun stores a reference to glyphs and indirectly to a suitable TextureAtlas based on the font needed by the glyphs. Whenever we recompute the glyph because some property has changed we: 1) Store information about the glyph we need 2) Generate a Rendering Entity for the glyph we need 3) Dereference the glyphs we don't need anymore (the old glyph run) Step 3) is performed last as whenever no more glyph reference a TextureAtlas, it gets deleted. If we were to do that first, we could end up in cases where we destroy the atlas and recreate it just after because the new GlyphRun actually uses the same font. TextureAtlases are tied to the lifetime of the scene's root node. However if the scene changes, the previous glyph run wouldn't be released. Since we don't keep a direct relationship between Glyphs and TextureAtlas (we basically do a getOrCreateTextureAtlasForFont and lookup available atlases in the scene), we could actually end up destroying a texture atlas we still need the next time we update our glyph run: When deferencing the old glyphs (whose texture atlas has been destroyed when the scene has changed), we would instead be removing references to the new atlas required by the new nodes (if they share the same font). To fix that, whenever the scene changes, we now clear the glyph run as well. Change-Id: Ibe62e2f6438c6655d2997681117c341302d64799 Task-number: QTBUG-70551 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * GLTexture: mark texture for upload when it's recreated and contains dataPaul Lemire2018-09-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | In some cases, a GLTexture will destroy its internal OpenGL texture before recreating it (when it requires a new allocation due to some property change). When this happens, we need to ensure we also request our content data to be uploaded after the new internal OpenGL texture is recreated. Change-Id: Ifd3f8a1e40e5fad63d117417006c65fade5c2b39 Task-number: QTBUG-70551 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Document third party asset 'miramar'Kai Koehne2018-09-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | The files got added in commit f49cabe35cbd. However, the original sources from the linked url are in .tga format, so I assume they got converted before importing. We should probably add a 'Modifications' entry to highlight such conversions in the future. https://opengameart.org/content/miramar-skybox categorises the license as CC-BY 3.0, but the upload was done not by the author. Change-Id: I312a871716104507434eb6d12a547c3752da51af Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update name of emscripten platform in requires conditionEskil Abrahamsen Blomfeldt2018-10-041-1/+1
| | | | | | | | | | | | | | The html5 platform was renamed to wasm. Change-Id: I4f69acb770e0a0b0013673e7ef8bf4af2aed4948 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Replace use of qmlRegisterRevisionKai Koehne2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | qmlRegisterRevision was incorrectly used to actually expose the revision to QML; anyhow, it is only meant to registering revisions of a base class that the type depends upon. This augments change 9884d3bffcdee9 (committed in 5.11). Change-Id: I42e79ee74f49ba825e175071c20b47606cc1837b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Add private export to GraphicsApiFilterDatav5.12.0-beta1Svenn-Arne Dragly2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | This makes it possible to use GraphicsApiFilterData outside of Qt3DRender, which is needed by the render aspect in qt3d-runtime. Change-Id: Iaf0b8293375f523b383129cbd49c747c12612ce8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Doc: Use a macro to resolve QML import versionsTopi Reinio2018-09-268-32/+32
| | | | | | | | | | | | | | | | | | | | | | QDoc now supports macros for its command parameters, as well as passing parameters to \code and \qml commands. Use these together with the new \QtMinorVersion macro to automate bumping the QML import versions within documentation. Task-number: QTBUG-67818 Change-Id: Ia09a5cc06bd6e7ccd41305cecbdac90318402d00 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-2211-19/+242
|\| | | | | | | Change-Id: I1a1c178055502b1cd37ad1be30dcb2f5409ed7a8
| * Complete ES 3.1 and 3.2 helpersPaul Lemire2018-09-218-4/+228
| | | | | | | | | | | | | | | | | | | | | | Which didn't handle indirect drawing, compute and tessellation Since ES 3.1/3.2 don't provide API for glShaderStorageBlockBinding, code was adjusted to use the default binding points and not require that API. Change-Id: Ie4dcd05f0a1d72e4a25f49b5fae138dc605ba5e3 Task-number: QTBUG-70660 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Replace use of qmlRegisterRevisionKai Koehne2018-09-203-15/+14
| | | | | | | | | | | | | | | | | | | | | | qmlRegisterRevision was incorrectly used to actually expose the revision to QML; anyhow, it is only meant to registering revisions of a base class that the type depends upon. Also remove one duplicated registration. Change-Id: I0c743fc951954870f13a7e0e099fc16a4b7efa4f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Quick3DEntityLoaderPrivateSubject: Fix warning about unused variableFriedemann Kleint2018-09-171-2/+0
| | | | | | | | | | | | | | | | In member function ‘void Qt3DCore::Quick::Quick3DEntityLoaderPrivate::loadComponent(QQmlComponent*)’: ../qtbase/include/QtCore/../../src/corelib/global/qglobal.h:1056:34: warning: unused variable ‘q’ [-Wunused-variable] Change-Id: I5ae96ae09f40578857355f114c0e71c8af0c575f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\| | | | | | | Change-Id: Ie0f4a56d544824845bea85d6650afa0bdd2e4818
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Iedf7378db2e180e91d79e07696064ef868b0167b
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-09-061-0/+24
| | | | | | | | | | | | | | | | | | Change-Id: Ic54262355ba79b138b09b467e9987df6fea66434 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* | | Automatically register the latest import versionKai Koehne2018-09-0616-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 2.11 in Qt 5.11) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Task-number: QTBUG-70290 Change-Id: Id221b5879f8c50a20fe5e26f9e141b82e4a196cb Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Fix warning about ignored qualifiersThiago Macieira2018-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | graphicscontext.cpp:229:90: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers] Change-Id: I495bc19409f348069f5bfffd15516b6a1d58d150 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-042-2/+2
|\| | | | | | | | | | | Change-Id: I75b7435eeb7d55e6d24b4951de9d402d70622866
| * | Qt3DWindow/Qt3DQuickWindow base custom surface format on default onePaul Lemire2018-08-292-2/+2
| |/ | | | | | | | | Change-Id: I52620326d7ee79be86419e55b186470689b02950 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add private API to access child nodes of QEntity and QFrameGraphNodeSvenn-Arne Dragly2018-09-038-18/+147
| | | | | | | | | | | | | | | | | | | | | | | | This opens up for reduced bookeeping on the backend, and is used by the experimental Dragon render aspect, which is currently being implemented in qt3d-runtime. Change-Id: I4cc2e98e4e0e7e8d456ed11c4fbc48db5c93f2a2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 77e418fde850c86e39d9dd8528876599fbe9dc34) Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Move forward declaration of QMetaObject inside Qt namespaceSvenn-Arne Dragly2018-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, tests can fail to build with the error: "reference to 'QMetaObject' is ambiguous" because ::QMetaObject is found in qnodecreatedchange_p.h and TestNamespace::QMetaObject is found in qobject.h. Change-Id: I533fc8013cb25ddddf11eec512eb40a419cd53d5 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 026545cb39dcd452757e7b785ae688ca201c7a92) Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Privately export ShaderBuilderPaul Lemire2018-08-291-1/+1
| | | | | | | | | | | | | | So that setPrototpesFile can be called Change-Id: I83b10c067ac5a3e94ea0f64725903d254984bc50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-08-254-8/+8
|\| | | | | | | Change-Id: I621a4bfeadfb6c2d3444c0071d00c403a2c4713e
| * Fix: remove compile warning in graphicscontext.cppPaul Lemire2018-08-211-1/+1
| | | | | | | | | | Change-Id: I3f1b5cca75973abf8970b3f1929a3a0ea385d8f1 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Doc: Fix Scene2D and Scene3D QML modules uriTakumi ASAKI2018-08-173-7/+7
| | | | | | | | | | | | | | | | | | | | This is additional fix for QTBUG-67370. And fix for Scene3D. Task-number: QTBUG-67370 Change-Id: Id362e60ac4072b7935ee86ff2a44e23018adc381 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Renderer: remove code shutting down thread in renderer dtorPaul Lemire2018-08-208-5/+248
| | | | | | | | | | | | | | | | This should have already been performed by Renderer::shutdown(). Doing it again in the dtor only hides potential issues. Change-Id: I33b02df42d1667ea4cbc02cb6f4cb8fabcf70996 Reviewed-by: Mike Krus <mike.krus@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 06:50:29 +0000