summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-171-0/+33
| | | | | Change-Id: I91f2b59967d6e35fe6c5285223a76e8908c56d50 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0824-41/+284
|\ | | | | | | Change-Id: If10a4fd620a4573be795ed8ffe1b8ed522976db7
| * Recompute bounding volumes when buffer changesPaul Lemire2019-01-072-1/+4
| | | | | | | | | | | | | | | | | | | | Right now the bounding volumes would be computed only when a geometry is marked dirty, which essentially means only when the geometry is first loaded. However, if a geometry buffer were to change, we need to recompute the bounding volume. Change-Id: Ie3fb83d1cc11a3bbfbe2b9828e9f8d7c302d175b Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Picking: viewport contains check needs to use pos in GL coordinatePaul Lemire2019-01-072-5/+32
| | | | | | | | | | | | | | | | | | | | The viewport rect is computed in GL coordinates. Therefore we need to check if the mouse is contained with the position in GL coordinates. The error is not noticeable unless you are using non full height viewport. Change-Id: I1c39ff91da4a3649288826b939071a298c83c723 Task-number: QTBUG-72856 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: Id8909db38df7d57c96bcd080ecd2e47344275b1a
| * QRenderCapture: Prevent crash on shutdown when replies are pendingChristian Andersen2019-01-062-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | When a QRenderCapture is deleted its destructor runs, then the QFrameGraphNode destructor, then the QNode destructor and finally the QObject destructor. The QObject destructor deletes its QObjectPrivate member, which destructs QRenderCapturePrivate. At that point the QRenderCapturePrivate tries to disconnect on an invalid pointer to the QRenderCapture (which was already deleted). Change-Id: Ib5835e3f86a282b963220b0dab656258111a61ab Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * configure: adjust to qbase changesOswald Buddenhagen2018-12-311-13/+9
| | | | | | | | | | | | | | call functions to resolve/verify the determined parameters. Change-Id: I1d0773b47e048a8b017c12216bd03625651921e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * configure: don't add system default library locations to fbxOswald Buddenhagen2018-12-311-6/+0
| | | | | | | | | | | | | | | | | | it's rather pointless. Change-Id: I7fe3fbd402cadb60d81f778fd30760c49dfe8c29 Reviewed-by: Svenn-Arne Dragly <svenn-arne.dragly@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * texture_property_updates test: specify texture formatPaul Lemire2018-12-211-0/+2
| | | | | | | | | | | | | | | | | | It used to work before because it would default to RGBA_Unorm but that should be either deduced when using a QTextureLoader or specified when using a raw QTexture2D Change-Id: I930ce490a393f48b870d4e2c1f15e0551c468f2d Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * Fix loading of animation aspect on iOSMike Krus2018-12-203-1/+15
| | | | | | | | | | | | | | | | | | | | | | Loading the animation aspect the same way logic and input aspect are handled. Otherwise aspect is not registered with the factory. Note: not ideal, should really fix the static registering of all aspects and not have any specific code like this Change-Id: Ic92256e344671ee3d550d32a06d91b1ddf396abf Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * QEnvironmentLight: add uniforms for envmaps sizePaul Lemire2018-12-204-6/+147
| | | | | | | | | | | | | | | | | | This makes future ES2 PBR implementation possible as textureSize() is not available on ES2 Change-Id: Ibf2b36240778a3f30f4316a67819f9052e46bdf1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * QEnvironmentLight: fix wrong getter callPaul Lemire2018-12-191-1/+1
| | | | | | | | | | | | | | | | Which resulted in incorrect specular texture bookkeeping. Change-Id: Iceed7e44e791f373f04c35f1a46f5c9ba97d012d Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * Texture: initialize internal format to NoFormatPaul Lemire2018-12-196-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format was initialized to RGBA8_UNorm on TextureProperties. This had the side effect that if you created a TextureLoader entry with no source yet set, the backend would try to load and return early since no texture data had yet been generated. Yet it would still send a notification change with the format (which was RGBA8_UNorm instead of NoFormat) back to the frontend QTextureLoader. This would prevent the QTextureLoader from later being loaded correctly with the format actually read from the image file. Also updated QTextureData/QTextureImageData/QTextureFromSourceLoader for consistency. Change-Id: I23e2287fac297b9b8901476715b1bc1e78c6342b Task-number: QTBUG-72651 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * QTexture: DDS handle uncompressed floating point format texturesPaul Lemire2018-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | These textures have a FourCC flag set but havign a fourCC flag doesn't mean the content is actually compressed. Adjust supported formats accordingly. Change-Id: Ided96d64acb6b5ad2f13cfaa9445bbc83c7bb93d Task-number: QTBUG-72650 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| * Fix unfinished commentThiago Macieira2018-12-121-0/+1
| | | | | | | | | | | | | | | | Found by ICC. Change-Id: I4ac1156702324f0fb814fffd156f815f33110f71 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ | | | | | | | | | Change-Id: I2863569ce82a446bee3bce6a9d4a93d3575a7992
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ic748e2bd8ecea11331c6f656c59bdc6741d82bce
| | | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-201-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 42a466e0c77e4ef209a51bfa04ee6ca2bcae99a4 Qt3DWindow/Qt3DQuickWindow base custom surface format on default one + 9884d3bffcdee9c6aabc51b036554947873b11c4 Replace use of qmlRegisterRevision + 9486a8a4b60a678280db2c625064ca78b3aaf489 Complete ES 3.1 and 3.2 helpers + b830f4307559007ff1b9c91bed6a881a6f6efdfb Document third party asset 'miramar' + e22971073ee10ee891c61a94f934b0b3403cc5a7 GLTexture: mark texture for upload when it's recreated and contains data + e879254613469b1b5290fca31ea69cb6ea407c06 QText2DEntity: clear glyphrun when scene changes + 999424908f17fa543baace39eb76a3c0ac89c7b5 Doc: Mark deprecated Qt 3D QML types obsolete + 74b8191968184bf94f14409be77566a2730de89e QOrbitCameraController: make zoom work when pressing shift key + 565a89ac4303f31b091eba05174e9724355fb747 Scene3D crashing on destruction + 6eb906bf5770370a8a5c15568d9f9463863e53a4 Use GLSL texture() instead of texture2D() on ES3 + dbaf2319dace853ae6c0badd7f46c7631961ad09 ES3 deprecated gl_FragColor, use output variable instead + c8e95f84095f3627a6b63ef66751525616c96d5d Add metalRoughFunction to ES3 + d05d2fd3d2fdc24604748a57ce26d48972457058 Fix QMorphPhongMaterial + 9b51fea01cc6b44c6ba49eda6a75cd92d9388689 Remove unused CameraController.qml from simple-qml example + c19036f8484e0ce08e4f38b7e0bd0d64772ded67 QChangeArbiter: fix leak + ff07ec93db2b56fb3c3047549a1ad7c7d0e367e8 Fix leak with VAOManager + 08f979f96f454fb407a86b939d48c66dc354d623 Further complete missing functions on ES3 helpers + c82d0c81aa109667a3fcef8637d25fc6ef6f6059 Fix compilation with -qt3d-profile-jobs on Android + d8789d8fd17fd58f06003e9846b3d107ffc8ec52 Fix normal calculation in MorphPhongMaterial + f575334691dedc5e34e6391fe638f313de8270eb Fix notifications for QClipAnimator::clip property + 3314694004b825263c9b9f2d69bd85da806ccbbc Fix crash due to racecondition in renderer on shutdown + fd9f66d17d79c4bebbd7b24d9bc52f9c87681ecb GLTexture: do not set layers when target is Texture3D + 726be38f774ea62c1f05003cca39fa2a68d794b0 Renderer::doRender scene3dBlocking fixes + d4835713b808503ab6d3039f3893355804a8a21d Bump version Change-Id: I17633ccd3c52332eb0c45683e78b40592682ec89 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | Fix sourceComponent property of EntityLoaderFriedemann Kleint2019-01-031-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the accessor to the property macro, fixing warning: Property declaration sourceComponent has no READ accessor function or associated MEMBER variable. The property will be invalid. Amends 4030e1796ca10c0eeab4fcb6cc6000b5bdb08028. Change-Id: Icc5048d34ecae4f7d0648002727362eaa97614a8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Enable ES3 rendering of MetalRoughMaterialMichael Brasser2018-12-052-1/+32
| | | | | | | | | | | | | | | | | | Change-Id: I1cc6700c9d16db1ad3e17f63a89d65c02bd8a202 Task-number: QTBUG-64390 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Add missing precision specifiers for ES3Michael Brasser2018-12-052-11/+11
| | | | | | | | | | | | | | | Change-Id: I008d42f09b587c0a6317ddb583b640b15e3b32ba Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Use the correct coordinatesystem include for ES3Michael Brasser2018-12-051-0/+9
| | | | | | | | | | | | | | | Change-Id: Ibb45e3daf0712d87ebfdab5376d60db93abe006e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Update QML import versions in "Qt3D QML Types"Kai Koehne2018-12-051-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Follow the example of qtdeclarative and always use the minor Qt version as import. Change-Id: I0adb53a793ddf6a4a9706e2ec1a147799a941e6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-053-2/+44
|\ \ \ | | | | | | | | | | | | Change-Id: I03355d00bd7219180e70345940855499be488d83
| * | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.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.12Qt Forward Merge Bot2018-12-044-6/+100
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I9f4dd807f0179d7bd95a5263e57c37198e7432f4
| * | | Reset last selected picker when releasing out of viewportPaul Lemire2018-11-302-1/+95
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iec70e84024caf879358183fee34638def5038aef Task-number: QTBUG-72160 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * | | Renderer: drawArraysInstancedBaseInstance parameters were swappedPaul Lemire2018-11-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FirstVertex and FirstInstance parameters were swapped making any draw call that requires baseInstance or baseVertex unusable. Change-Id: Icf52f96981d8868bec4c6888bd129ed6e43d39e9 Task-number: QTBUG-71994 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | Remove wince check as it is not supportedOliver Wolff2018-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4f12b9d823d8468b3a66de0242a5a6d6de27d702 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id9365d9acd2d5227cca5c7d025618f37e374d275
| * | | Revert disabling of tools building on cross-compiled buildPaul Lemire2018-11-131-1/+1
| | |/ | |/| | | | | | | | | | | | | Change-Id: I66319ebe87b8f5a10cc20e6f57d0f25ca0694b2f Task-number: QTBUG-70701 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I195ce045c22f4dcfb0fec916fd5ee3476a59fd44
* | | Add ES3-specific coordinate systems shader fragmentMauro Persano2018-11-082-0/+74
| | | | | | | | | | | | | | | Change-Id: Ie7f469278b0a74b4c059ad99ad182059c6752cd8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Liang Qi2018-11-082-5/+7
|\ \ \ | | | | | | | | | | | | refs/staging/5.12
| * \ \ Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-082-5/+7
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ia208586ec402c9ce29bafc9085804d8b1a62b155
| | * | Renderer::doRender scene3dBlocking fixesPaul Lemire2018-11-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Reorder sleep and locks -Properly protect isFrameQueueComplete lookup -Reread queueIsEmpty which could have been updated Change-Id: I2b5a52284bbb3ddb48483c5bf73779e335c8bdda Task-number: QTBUG-71294 Reviewed-by: Christian Andersen <csandersen3@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * | GLTexture: do not set layers when target is Texture3DPaul Lemire2018-11-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because Texture3D doesn't support layers and that results in a warning being added to the console. Change-Id: I54d34ccccc2bc1f022814689b97aaaf624026249 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | | Add documentation for QText2DEntityMike Krus2018-11-083-11/+88
|/ / / | | | | | | | | | | | | | | | | | | | | | Also fix the shaders to work on macOS Change-Id: If1fb183741c21b284474c9d747c8dd4c70b9d779 Reviewed-by: Wieland Hagen <wieland.hagen@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Documentation: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-073-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of QT_INSTALL_HEADERS caused documentation build failures in certain configurations. Use an alternative method to pass the required include paths to QDoc; make the documentation subproject depend on (a subset of) Qt 3D modules to retrieve them. Task-number: QTBUG-67925 Change-Id: I2fb745fb59c319b85c51b544acdab95cded2207e Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Doc: Fix various documentation warningsTopi Reinio2018-11-076-3/+7
| | | | | | | | | | | | | | | Change-Id: I3eecd06bba9438b5aa472f3ba7ecaecdeda985e2 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Qt3DWindow: Redraw scene on expose events when using OnDemand renderingChristian Andersen2018-11-063-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an InvalidateFrame QNodeCommand in QRenderSettings that is sent to the RenderSettings backend node. The command will mark the current frame as dirty. This ensures that whenever an expose event is received, a redraw happens some time in the future. Task-number: QTBUG-70885 Fixes: QTBUG-59785 Change-Id: I9fd2e19dbc282300479131d95ff8320269f95f24 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Make floating point precision explicit in ES3 MetalRough shaderMauro Persano2018-11-051-92/+94
| | | | | | | | | | | | | | | Change-Id: Ibd59dd30e31ded3cbf169fa583d537a7d67fee96 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Doc: Add doc to undocumented methodsNico Vertriest2018-11-017-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - qcomponent.cpp - qbackendnode.cpp - qjoint.cpp - qskeletonloader.cpp - qframeaction.cpp - qscene2d.h - qrenderaspect.cpp Change-Id: I25881dee19d2d01f948bfaf4a156a97f6caaea73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Doc: Add doc to undocumented methods and properties qt3dNico Vertriest2018-11-011-3/+71
| |/ |/| | | | | | | | | | | | | Adds doc for undocumented methods in qnode.h and qnodecommand.h Task-number: QTBUG-36985 Change-Id: I1eb28916ba8862a414dccd58a3c56b84a89f99d0 Reviewed-by: Laszlo Agocs <laszlo.agocs@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>
View Lorry Controller Status