summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-101-0/+26
| | | | | Change-Id: I81f5367a391bc80f83ed4648a89cafc8ab379671 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-041-1/+1
|\ | | | | | | Change-Id: If1f3b672700fe67099dc5e5f6eb554129c4a1b41
| * QScenePrivate: Fix compiler warning about initialization orderFriedemann Kleint2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize m_postConstructorInit before m_rootNode, fixing warning: qscene.cpp: In constructor 'Qt3DCore::QScenePrivate::QScenePrivate(Qt3DCore::QAspectEngine*)': qscene.cpp:75:12: warning: 'Qt3DCore::QScenePrivate::m_rootNode' will be initialized after [-Wreorder] qscene.cpp:72:45: warning: 'QScopedPointer<Qt3DCore::NodePostConstructorInit> Qt3DCore::QScenePrivate::m_postConstructorInit' [-Wreorder] Amends 985a61921fbcb893b89b8dde6eeaab5cf8c5dc1c. Task-number: QTBUG-74106 Task-number: QTBUG-73905 Change-Id: I53ced159cf86325d577464e6f5873eb83d1b2038 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 5.12 into 5.13Paul Lemire2019-04-2666-370/+2030
|\| | | | | | | Change-Id: I42affdd02bddb5205b9f2455f0c5e5efbd414dd8
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-251-0/+20
| |\ | | | | | | | | | Change-Id: Iea8a87a0da1b2143fa476ecb4d6184460d93e8a5
| | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-031-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a075f064f0d8a0bb9d467a813ef2eacf39453ec2 Set OptimalParallelJobCount to at most 4 + 22c66fa9f7a460f077fede22f285c84276ce3883 Use slerp for animating rotation channels + f72c8abf5f9844214aab9b587bdd7e6921a3e272 Fix light attenuation for ES 2 + 4af8fcdc05d0198a569e7c39fa934614bbe31803 tests/auto/render/render.pro: Remove duplicate entry "scene2d" + 31aa763b0d1f4ec2439c6dc33b4a63b88c16369e Make slerping safer + a7e8df28c7f667a8f1e23ff865268e7f06d43328 Fix member overloads + e9868e157b56eea991e34712eace5962d14543e6 Don't reset texture units at every frame + eb337567713df9c23c0686d3c6b15b6780cf1f35 Expand Scene3D documentation + 7a0d24164afc1c7d2075c68260af21bfefd07021 Bump version + fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 Scene3D: Call update on the item not the window + b79e4a8b2a8783fc9eeaaa36e710adf2fb8c7879 Revert "Scene3D: Call update on the item not the window" + e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 Dont play animations that are disabled Change-Id: I3badad7396927857bb4b5fedf46f1714dd992a27 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Fix slerp interpolation when two quats are equalJuan Jose Casafranca2019-04-221-4/+4
| | | | | | | | | | | | | | | Change-Id: Ibcf668adfc3d701bf2b27f9f25626f819e2445b3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Cleanup debug output in Quick3DEntityLoaderPrivateJ-P Nurmi2019-04-181-3/+0
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-72514 Change-Id: If6e1b36fef570a1acaa90223b431123b597dafd5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Fix FrameGraph node parentingJim Albamont2019-04-166-72/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framegraph suffers from the same problem as Entities. When they are created they pass their parent FrameGraph node, and not their parent QNode. When reparenting them we need to make sure the same thing happens otherwise you get backend FrameGraph nodes parented to non-framegraph nodes and they are just dropped from backend. Change-Id: I1b9cab2c9e869c690c4c43208e62a1044b3359a4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Cache light/renderable/computable vectorsJames Turner2019-04-108-59/+300
| | | | | | | | | | | | | | | | | | | | | | | | This avoids running these jobs when lights / renderables have not changed in a frame Change-Id: I604180fe3442ab67648c4ba5d9effb8639c68ef7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Disable ShaderBuilder unit testsPaul Lemire2019-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | To allow Qt base QShaderGenerator changes to be merged Change-Id: I0036215bc5f841246cc109f21c87a07563ec0f11 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Move some debug code inside the #ifdefJames Turner2019-04-101-1/+2
| | | | | | | | | | | | | | | Change-Id: Ib8792c702f1d8089480cee6404178626ccdcbed6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Early-return on these jobs if no work to be doneJames Turner2019-04-102-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | This avoids scene traversal in the case there is no LoD / skinning active Change-Id: I502c38ffe3c23a11543034861778d74d80841744 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Fix the build with -no-guiLiang Qi2019-04-097-2/+23
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-74602 Change-Id: If9cf0795e887a0b3cdfed0a6f5e7798116ef137d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Fix backend node creation order using an initialization queueJim Albamont2019-04-086-3/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backend nodes should always be created from the top-most parent down ensuring that every parent is created before its children. The original way of creating backend nodes by calling _q_postConstructorInit in a deferred manner from the QNode constructor breaks this because backend node creation happens in the order that the nodes on the front-end were created. This was often incorrect when reparenting newly created nodes. Fix by creating a queue of nodes needing a _q_postConstructorInit call and only adding nodes to the queue if one of their ancestors is not already in the queue. This ensures that _q_postConstructorInit is only called for the top-most node in any subtree. This behavior exactly matches the creation behavior when building a subtree and reparenting it to a node with a backend. Doing silly things like creating a node with a parent that has a backend then immediately reparenting is now safe. After this patch, it should be safe to assume that backend nodes can always find their backend parent. Adding only the top-most nodes to the queue and processing the entire queue at one time also ensures that all creation events get sent in the same batch. This fixes the problem of having backend nodes referring to other backend nodes that haven't been created yet. Task-number: QTBUG-74106 Task-number: QTBUG-73905 Change-Id: Idcf38d6c3164f6be4394a3b25554547414061059 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Fix Entity parenting hierarchyJim Albamont2019-04-0425-41/+759
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the initial Entity backend node hierarchy is created it skips over any non-entity nodes to ensure that Entities are only parented to other Entities. Calling QNode::setParent breaks this when reparenting Entities to non-entity nodes. Fix by sending a new "parentEntityUpdated" property update that backend Entity nodes listen for. They keep the id of their new parent and flag the need to rebuild the entity hierarchy. This triggers a new job to clear the children and parents of every backend Entity, then rebuilds the hierarchy using the stored parent ID in each Entity. This is much more forgiving of creation/parenting ordering issues and shouldn't be less performant because any Entity reparent was previously marking everything dirty anyway. Add a new test from QTBUG-73905 that creates 4 cylinders and manipulates the parents in different ways. Add a new test to tst_nodes to reparent a QEntity to a QNode and ensure the entity finds it's correct QEntity parent. Add a new test to tst_entity to ensure backend nodes correctly handle the new parenting events. Task-number: QTBUG-73905 Change-Id: Iab0203947d89bbed2868b3629fbde879675fe568 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Animations: handle variable length propertiesPaul Lemire2019-04-0312-176/+671
| | | | | | | | | | | | | | | | | | | | | | | | | | | For that we know determine the expected number of channel components for a given property in the frontend where we have access to both the type and the value rather than in the backend using the type only. Change-Id: I75aca20d43dd1b3db316c303af041acd557c07e4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Fix assert when using QScreenRayCaster with multiple viewportsGiulio Camuffo2019-04-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mouse can't be in all viewports at once so the ray will not be valid for all the viewports. Cherry-picked from b68ebfde583dc5cec7ae60f752f1e05371e57dba Change-Id: Id196f043c4f670cd2106993fc5c0a9dd468a491e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Disable ShaderBuilder unit testsPaul Lemire2019-04-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | To allow Qt base QShaderGenerator changes to be merged Change-Id: I26088ccf55b510b5eb845c583c0551ccfd817eb7 Task-number: QTBUG-75384 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Remove unused codev5.13.0-beta3v5.13.0-beta2Mike Krus2019-04-043-71/+0
| | | | | | | | | | | | | | | | | | Change-Id: I292b8b373e0f34dfc51f2a77f082fda920893e64 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: James Turner <james.turner@kdab.com>
* | | Switch export macros to standard formKai Koehne2019-04-02465-600/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from src/doc/qt3d.qdocconf Task-number: QTBUG-74752 Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Merge branch '5.12' into 5.13Paul Lemire2019-04-0249-382/+1217
|\| | | | | | | | | | | Change-Id: If17511da64dd666a536408aa3cb3178ef6db0403
| * | Update the backend's buffer data when updating part of QBufferGiulio Camuffo2019-04-022-1/+2
| | | | | | | | | | | | | | | | | | | | | Cherry-picked from da7e453d001715f9b0fc9eaf29dd245058e23dab Change-Id: I9cf18df56d501c7ea49727bc2d1da20371308d4a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Unify shader include handlingMichael Brasser2019-04-019-51/+52
| |/ | | | | | | | | | | | | | | Share the code for this between QShaderBuilder and QShaderProgram. As a side effect QShaderProgram gains support for absolute paths. Change-Id: I71dbe0bff702806f0655992008c54bbaa9c4f2c9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Dont play animations that are disabledJuan Jose Casafranca2019-03-282-9/+49
| | | | | | | | | | | | Change-Id: I5293ff8d16c511de79c4583783b238154af32f61 Task-number: QTBUG-69373 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Revert "Scene3D: Call update on the item not the window"Paul Lemire2019-03-281-1/+1
| | | | | | | | | | | | | | | | This reverts commit fa12f14b2b97249b68652ed9f5fd0df0c0c27be4 which would break rendering any dynamic scene when using Scene3D. Change-Id: I3bc61975106aa75c24e3bddd38993e4809c557c3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Scene3D: Call update on the item not the windowAnton Kreuzkamp2019-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On scene change QQuickWindow::update was called to ask the QQ2Renderer to rerender the scene. The problem here is, that calling QQuickWindow::update is percieved as a call to rerender under all circumstances, while QQuickItem::update only means update if the scene graph actually changed in the end. Using QQuickWindow::update the scene will be rerendered even if the Scene3D item is invisible, using QQuickItem::update it won't. Change-Id: I1ff455628d3e536349683b064acaeadd354ec864 Fixes: QTBUG-72923 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I62461afca838e2764b9f65d7b9be31c4d9f0b9c5
| * Expand Scene3D documentationMichael Brasser2019-03-201-16/+28
| | | | | | | | | | Change-Id: I2925920af001927ae9a843c7dde02ca48786834c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * Don't reset texture units at every frameMike Krus2019-03-185-189/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resetting texture to unit assignment at every frame seems to trigger constant shader recompilation on macOS. Maybe GL driver is implemented on top of Metal which has more restrictions. Not resetting the assignment means the same texture units are used for consecutive frames and fixes excessive recompilation. Refactored the code to move the texture handling to separate class. Change-Id: I480f76e7e7b0ea669c6acb039cc3d079937ff97f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-1511-23/+445
| |\ | | | | | | | | | Change-Id: Idc824e1b8191e5fa624966e619075b1ec8c850c6
| | * Make sure backend node is created when component is added to Entityv5.12.2Svenn-Arne Dragly2019-02-224-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition, the parent of the component and all further ancestors need to be registered on the backend. We do this by calling QNodePrivate::_q_postConstructorInit on all these nodes. Also add autotest that triggers the case referenced in QTBUG-72236 to avoid regressions. Change-Id: Ibf8f43654d145ea8b8082b2f30123ea65e42ff55 Fixes: QTBUG-72236 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: James Turner <james.turner@kdab.com>
| | * Add test for component added to parent with pending backend creationSvenn-Arne Dragly2019-02-221-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test makes sure that the order of events is correct when a parentless component is added to an entity that does not yet have a backend node because it was created with a parent and thus has not yet called _q_postConstructorInit. Change-Id: I6d15003549cc9d327c5c2de84723e5f8897e4dcf Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Fix broken creation order for nodes used as propertiesSvenn-Arne Dragly2019-02-222-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, child nodes may be constructed before their parents and their node creation changes will arrive at the backend out-of-order. This could result in a child node referencing a parent that we have not yet received a creation change for. Also add a unit test to take this case into account. Change-Id: I26b29e63863d1686e7b9239c63297c7e6c341f4e Task-number: QTBUG-73986 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Load static plugins when QT_NO_LIBRARY is setAnton Kreuzkamp2019-02-222-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QT_NO_LIBRARY was set, QRenderPluginFactory::create and QSceneImportFactory::create would simply do nothing, causing no plugins to ever be loaded. On static builds with QT_NO_LIBRARY plugins can still be used by using static plugins. The plugin factories omit them, even though QFactoryLoader, which they both rely on, supports loading static plugins when QT_NO_LIBRARY is set. Commit d964eab8 did a similar thing for QSceneImportFactory and QInputDeviceIntegration. Task-number: QTBUG-72378 Change-Id: I97912a34940e821bda6c0ae830baff4d773451f3 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Always load scene2d render plugin in static buildsAnton Kreuzkamp2019-02-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene2d requires support from the Qt3D renderer, which is implemented in form of a renderer plugin. The renderer plugin is implicitly loaded when the scene2d module is loaded, through use of Q_COREAPP_STARTUP_FUNCTION, which does not support static builds, though. This change adds code to initialize the scene2d render plugin to the constructor of QScene2D, so that the first QScene2D object created will initialize the renderer plugin. Task-number: QTBUG-72378 Change-Id: I6f625e79a5be9f5a23dcc881f9b360382008032b Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Add manual test for backend node creation for componentsSvenn-Arne Dragly2019-02-223-1/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | This test triggers the case referenced in QTBUG-72236 and is added to avoid regressions. Task-number: QTBUG-72236 Change-Id: I797015dfe25a084e75183c02e07dddb224fbc738 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Add changes file for Qt 5.12.2Antti Kokko2019-02-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 82eb8b44e0a3d1dc586acc52132be2b05102900c Fix env-map less rendering + 093484cd41e0b727e4f2a33bd753a778e62af819 Bump version + 382f99cb4b399118bd64115e5a143da098b5f234 Fix issue with invalid textures + 77aa17d543f09802f1d9eade8ab1278b0fba203f Avoid repeated warnings + ff36269001b1e0b13266ac14064657cbe2b0ed34 Doc: Add doc to undocumented methods and properties qt3d + a82fdf26ef28bee65b99850a745540b6ba92cbf4 Document that QMetalRoughMaterial has an ES 3 technique + 16701c2b3cb88e1a7092fcb244793dffd69cfe28 Doc: Fix external link error for SceneLoader + 29683b1f79bdd6ffa8c8b02155c20995ad704770 Add revisioned QML registrations for QAttribute + a0194f58b3dbcb9aa10cf86f0239d284733493f6 assimp: Provide names for generated child entities + f7e1a38eb8b548a739e8e67eb7e5e6af3c4c0bc7 Always export scene2d shared object + 3c68eeac236b2e33cf34d2f23e04a8d156118eb0 dFdx/dFdy require GL_OES_standard_derivatives under ES 2 + 43d70a6b02f14b7febfd9419bdd707d07e1eaf60 assimp: Fix warning about uninitalized variable + 890b5493d1c19a8be50526250c5d46fb42d01d88 Qt3D depends on QtGui + a7e5adde24a9f79c121f8f9427fde487395bf40a Fix scene2d starting trigger when setting item late + 0247b3ba4fa15c0b697c9b3b0829b5d1c9a50892 Fix opacity for Scene3D + 52c3f9ab735bf0dfe611402ea456afc56ccdeb37 Fix Assimp scene loader plugin resource paths + efa4665b316dbd5361b0936a1135f45c141f14aa Enable assimp for gcc 5.x builds + 7f9fdca73a17060b9d69db00b5d480690dcae935 Doc: clarify some properties + 3c585d6d23ecfcb6960adbefb411e5be716068af Fix: rebuild material and layer caches when FrameGraph tree is dirty + b237f38e89016b40861de1e0675dc2ba5b3f361a renderview.cpp: move file variable into anonymous namespace Change-Id: I3b3ad3d5b402130f5674b6006617146c1f4c23a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | Fix member overloadsMike Krus2019-03-144-26/+10
| | | | | | | | | | | | | | | | | | | | | | | | m_currentVAO and m_glHelper were hiding members in parent class. Removed overloads and cleaned up initialization. Change-Id: I174dffc63c812e0b4241018c86e560de48a31a0b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Make slerping saferSean Harmer2019-03-111-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | Now handles case where the two bounding keyframe quaternions are equal by returning the first as the interpolated value. Change-Id: I43d0dfb1e20afafd690817d30aeac2d510847422 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * | tests/auto/render/render.pro: Remove duplicate entry "scene2d"Friedemann Kleint2019-03-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry is added unconditionally and in a scope qtConfig(qt3d-input). Remove the first entry, fixing: Makefile:3343: warning: overriding recipe for target 'sub-scene2d-qmake_all' Makefile:2918: warning: ignoring old recipe for target 'sub-scene2d-qmake_all' Makefile:3347: warning: overriding recipe for target 'sub-scene2d' Makefile:2922: warning: ignoring old recipe for target 'sub-scene2d' Makefile:3350: warning: overriding recipe for target 'sub-scene2d-make_first' Change-Id: I6e702cdea2e31eb0de64c7efb7d39b56265fa6ef Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Fix light attenuation for ES 2Michael Brasser2019-03-064-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | These shaders were never updated to be in sync with the renames made for Qt 5.7+. Change-Id: I95c64c150e0c4060374467942a2973b7687a88ca Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Use slerp for animating rotation channelsJuan Jose Casafranca2019-02-228-14/+220
| | | | | | | | | | | | | | | Change-Id: Ic6aa6fd1c1a1e7757dba9466b59d20834b56e246 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Set OptimalParallelJobCount to at most 4Paul Lemire2019-02-221-1/+4
| |/ | | | | | | | | | | | | | | | | Profiling reveals that on fast cpus, having more jobs is counter productive. Set it to at most 4 as it seems to be a good all around values while waiting to fine tune it later on based on platform and hardware. Change-Id: I95033e34f10d7f37dfafe0b21c6724466eb78fae Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * renderview.cpp: move file variable into anonymous namespacePaul Lemire2019-02-191-1/+2
| | | | | | | | | | Change-Id: I06cd85c76e513364abe754da51abac07dfd99821 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Fix: rebuild material and layer caches when FrameGraph tree is dirtyPaul Lemire2019-02-194-38/+92
| | | | | | | | | | | | | | | | | | | | This could otherwise result in black screens when the FrameGraph tree is updated and no other change is sent. Screen would remain black until some other element with dirty changes triggers a cache rebuild. Change-Id: Iac43965f06d1d644de14e6a6c8768e035bed69a6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Fix deprecation warnings about Qt3DRender::QBuffer::BufferTypeFriedemann Kleint2019-03-128-40/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the calls as 6158b4ae7cc88848b03d5d592a671de7113c4faf states that it no longer has any effect, fixing: gltfgeometryloader.cpp:333:18: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] gltfgeometryloader.cpp:371:54: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] basegeometryloader.cpp:155:39: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] basegeometryloader.cpp:202:46: warning: 'void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)' is deprecated [-Wdeprecated-declarations] instancebuffer.cpp:61:39: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is dep tst_qbuffer.cpp:79:96: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:85:100: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:128:109: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_qbuffer.cpp:132:57: warning: ‘void Qt3DRender::QBuffer::setType(Qt3DRender::QBuffer::BufferType)’ is deprecated [-Wdeprecated-declarations] tst_attribute.cpp:56:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_attribute.cpp:108:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:74:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:271:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_buffer.cpp:297:68: warning: ‘Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)’ is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:519:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:574:95: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:967:83: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_gltfplugins.cpp:969:82: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:56:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:57:116: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] tst_trianglesextractor.cpp:199:118: warning: 'Qt3DRender::QBuffer::QBuffer(Qt3DRender::QBuffer::BufferType, Qt3DCore::QNode*)' is deprecated [-Wdeprecated-declarations] Change-Id: I6835598a1771a0ec3a0b080911fa4cada210a01a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QAbstractTexture: Fix \since for handle, handleTypev5.13.0-beta1Kai Koehne2019-03-071-2/+2
| | | | | | | | | | | | | | The properties added in 5149ff8c645a are new in 5.13, not 5.12 Change-Id: I6780583bc2cfcc7ca846ea68d44c2e14d9a85f27 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-078-19/+230
| | | | | | | | | | | | | | Task-number: QTBUG-73484 Change-Id: I77bae973a9be7e01c674fd6bbccc0feb0c35e0f1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QML: Fix registration of ShaderProgramBuilderKai Koehne2019-03-071-1/+1
| | | | | | | | | | | | | | | | The registration was missing the revision number. This augments d403604d74780b. Change-Id: I730819a5a0135f490edde8667d23cd9c28f12afd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 18:34:29 +0000