summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add ; to Q_UNUSEDLars Schmertmann2020-06-2463-183/+183
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I2e126d0be8efa0aa89c4a91a681b549f38c8cec4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* rhi: update with qt3d changesJean-Michaël Celerier2020-06-235-32/+7
| | | | | | | | - removal of aligned_alloc - removal of renderthread Change-Id: I7ccbf15f3266867f256d983b1750a9420b79d296 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Clean input event handlingMike Krus2020-06-2316-256/+60
| | | | | | | | | - Clean up header dependencies - Remove EventSourceSettingHelper as threading is no longer an issue - Remove some locks which are no longer needed Change-Id: I071173d3b4c681f5420bd7a1f4cb13f80a9c9b2f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* rhi: QTextureMaterial: add RHI techniqueJean-Michaël Celerier2020-06-222-0/+20
| | | | | Change-Id: I5d085cb017869406d33823362b6fe4052b7b60df Reviewed-by: Mike Krus <mike.krus@kdab.com>
* rhi: fix missing texture filter caseJean-Michaël Celerier2020-06-221-0/+1
| | | | | Change-Id: I43758a2c07bd214471e8f5e15ecbb6f8b59b6244 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* rhi: add a manual test to try render targets simplyJean-Michaël Celerier2020-06-226-0/+573
| | | | | Change-Id: I4e9418e92cd8055e0d653dd3c4f33b526893ed75 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* rhi: backport opengl renderer changesJean-Michaël Celerier2020-06-2217-941/+1152
| | | | | Change-Id: I5c504d9972e4863647d75565854ecdd64b952e20 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Restore assimp scene loaderMike Krus2020-06-222-3/+4
| | | | | Change-Id: Ib5de3d699a3b5606408f31d579a2183004cfc321 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix AVX2 AlignedAllocatorPaul Lemire2020-06-198-7/+15
| | | | | | | | | | | The allocators should also be part of the SIMD specific files that have special compile flags. Use this opportunity to move aligned_malloc from Qt3DRender to Qt3DCore so that any file in any module relying on it gets the proper compile flags. Change-Id: I7e18aeb195e9d34d4917be4ecccabfd82e40c0dd Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Remove the OpenGL Render ThreadMike Krus2020-06-1933-283/+84
| | | | | | | | | | | | | | | | | | | | We're trading a bit of performance at submission (since we could start preparing the next frame while submitting the current one) for convenience and ease of maintenance. Besides, this allows to remove a thread and in cases Qt3D was used with Scene3D, which is likely the majority of cases, the RenderThread was not used anyway. To control whether the QRenderAspect should submit on its own or not, a new Submission type enum with values Automatic/Manual was added. This allows the QRenderAspect to automatically perform command submission when Qt3D is used on its own. For other cases when Qt3D is integrated into a 3rd party engine or with Scene3D, the Manual mode is used to let the QRenderAspect render only when it is told to do so. Change-Id: Idc270b5a07bcb9ea9e61674a69c6b8cf6ccd8182 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Handle config flags to turn aspects on or offMike Krus2020-06-1811-43/+77
| | | | | | | | | Also restores RHI option but it's off by default. Moved render module config to renderer plugin folder as those are the only options for now. Change-Id: Ie102e5b9365b3bea8f4bc97cb76b3a19851b1fa5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove custom gltf toolMike Krus2020-06-1717-3878/+0
| | | | | Change-Id: I36ae2a043af155d2f2408dce5fcfae7f6e98823d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix compile warningsMike Krus2020-06-177-105/+12
| | | | | Change-Id: Ibb17168e1c75c4802764e2ccfb3dd6d8257402dd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Scene3DRender: connect to beforeRenderPassRecording to perform drawPaul Lemire2020-06-173-24/+1
| | | | | | | | | | | | | | | | | | | | Previously we were connecting to beforeRendering which happens prior to RHI having created its render pass. When RHI creates its render pass, it clears the rendering surface. In the case Scene3D is used in Underlay this would therefore clear the 3D content. We now connect to beforeRenderPassRecording which happens after beforeRendering when RHI has created its RenderPass (and therefore cleared the screen) but prior to drawing/recording commands for the actual QtQuick rendering. This allows Qt3D to clear (if FrameGraph has that operation) or not and should work for both Underlay and FBO rendering modes. That being said, at the moment, apitrace shows that QtQuick still clears before drawing after beforeRenderPassRecording what emitted. This lead to Scene3D in Underlay compositing mode to not be visible. Change-Id: I55bd5ae9f26926f06e9e50793da316918b78b6b7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix GL state resetPaul Lemire2020-06-171-2/+2
| | | | | | | Qt3D expects the DepthTest to be enabled by default Change-Id: I9fbe437f3d4d21fb6d419387a44827f89439da46 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* sync.profile: Remove coretest module referencePaul Lemire2020-06-171-1/+0
| | | | | | | | This must have been dropped while switching to CMake Task-number: QTBUG-85066 Change-Id: I2ad7379a5247620fe8e8adbf6c4ec28d8cbdd486 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* QNode: remove property tracking modePaul Lemire2020-06-1721-839/+3
| | | | | | | This serves no purpose since the synchronous synching was put in place. Change-Id: I4509cc348168d614388f73a26f8420b26629ace6 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Restore building of examplesMike Krus2020-06-172-35/+27
| | | | | Change-Id: Ie9a73a025bc8de8dc58b6f283dc8467d9a6a1473 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix handling of SSE/AVX sourceMike Krus2020-06-176-9/+58
| | | | | | | | | | | | | | | | QtBase has macro to enable SSE handling on specific source files. But Qt3D has some classes which use those specific instruction set in headers, so any file that includes those should also have the right command line options. This adds the right command line arguments to the 3DCorePrivate target so that anything that depends on that will have the right options. 3DCore is fine because it knows about the special headers files which were tagged. Change-Id: Ia061750121fb2ab5c93600c08a5464179ca2c228 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3D reset OpenGL state prior to drawingPaul Lemire2020-06-173-8/+31
| | | | | | | | | This works around that QQuickWindow::resetOpenGLState has been removed in Qt6 and moved to the QQuickFrameBufferObject class which we don't use. Change-Id: I292fc65c160e964769aed360e91bf14525abbb0e Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Make sure bounding volume gets updated in main threadMike Krus2020-06-171-5/+3
| | | | | Change-Id: Icb640217f101538c7564472422837c3da687757b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove use of clear before rendering settingsMike Krus2020-06-172-13/+15
| | | | | | | | Gone in 0d43e21429ee23442ec3a99f641a5665d66e75e2 in QtDeclarative Rendering will need updated to use new signals Change-Id: I90e34fa974e35b306c6b480643a4a31f7a0eff8c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2020-06-171-3/+3
| | | | | Change-Id: I90fb0e7c92762fbbea872b2dd46ca268518bcfbd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Blit: Fix attachment binding pointPaul Lemire2020-06-161-2/+19
| | | | | | | | | | We assumed we would only have 15 color attachments at most. In cases you have more or less, if request Depth or Stencil binding points, we would have used an invalid value. Change-Id: I2ecfefbff043fc80efff4b5ad777f3d365f424c2 Pick-to: 5.15 5.12 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2020-06-161-3/+3
| | | | | Change-Id: Ic104961a5375f24adaf4d8111623af92e81b2bde Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update Scene3DSGMaterial following latest API changesPaul Lemire2020-06-162-2/+3
| | | | | Change-Id: If7953e648c70319e0d1b978106f5f07cdd234f69 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Don't register Window typeMike Krus2020-06-161-2/+0
| | | | | | | Import QtQuick.Window instead. Change-Id: Ica99e295125b09f9489a80ed9c743dde9e97471a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* MouseEventFilter: use QMouseEvent::position for move eventsPaul Lemire2020-06-161-1/+1
| | | | | Change-Id: I7ea8811b4d23e24d7534f30d3265da2b4b5ab225 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2020-06-151-1/+1
| | | | | Change-Id: Id6e1975331ef3081c18581e267a1915637cdb741 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Disconnect the context connection when the GLShader is deletedAndy Shaw2020-06-152-0/+7
| | | | | | Pick-to: 5.15 5.12 Change-Id: Iacb32f9ea0047eedf87e53ebdeaeecada0f7cd48 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update dependencies on 'dev' in qt/qt3dQt Submodule Update Bot2020-06-151-10/+5
| | | | | Change-Id: I4f521ebf860d1339dfd48d48b4c70c0d233a49e8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change how resources are bundled for Scene3dMike Krus2020-06-132-2/+2
| | | | | | | Fix static build Change-Id: Ifc2ef78694c2b8fe53961cee75371e5431fff9c4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependenciesMike Krus2020-06-123-7/+9
| | | | | | | | Commented out calls to resetOpenGLState which has moved in QtDeclarative. Leaves Scene3D and Scene2D in broken state. Change-Id: Ib1a5dcdde34c1bb177518dd891d123d3a5322d9d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Update dependenciesPaul Lemire2020-06-1221-189/+90
| | | | | | | | | | | - QOpenGLEXtensions now private API in GUI - Removed support for tessellation in GL 3 - Use QMouseEvent position - Removed use of QDesktopWidget - Adapt to change in QQuickWindow API Change-Id: I79df8780b9d02c6d2a3620529f5f41daec7120fe Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update Scene2D example to use QtQuick.Controls 2Paul Lemire2020-06-113-29/+28
| | | | | | | Change-Id: I4ab815079a5fd794714bc5a7cad05e970afcd731 Pick-to: 5.15 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com>
* Fix Scene3D to work with latest QtQuick SceneGraph RHI changesPaul Lemire2020-06-1112-102/+124
| | | | | Change-Id: If507aac8d48cc33fa7acf993ab77b76cdd70ee9a Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Add more fixes for stand alone testsMike Krus2020-06-112-1/+4
| | | | | Change-Id: I26916ec35565af3a710ea47eb8c90fba4e3cb90b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Disable assimp related targetsMike Krus2020-06-112-6/+6
| | | | | | | Fails CI with CMake Change-Id: Ib9bed74c33cfcac150bc2d2dcfa720e88d14cfb1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Disable gl renderer tests on stand alone testsMike Krus2020-06-111-18/+20
| | | | | Change-Id: Iea18efffcd2515852fe5014115ff79883d0e57c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Remove most examplesMike Krus2020-06-101-29/+29
| | | | | | | | Trying to please CMake CI which crashes on large resources. Will add back later. Change-Id: I5b57e9b1326e37624bf209813c4ae7c9a0c6762f Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* Qt6: Port Qt3D QStringRef to QStringViewKarsten Heimrich2020-06-102-23/+22
| | | | | | Task-number: QTBUG-84319 Change-Id: Iee0ba69dcd754956815e7be94521f8bbee667829 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Disable warnings-as-errors globallyMike Krus2020-06-102-2/+5
| | | | | | | See if this makes CI happy Change-Id: I8095e586c3dd4b1081a2c5e3fa1ed470c8f29430 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix a broken merge resolutionGiuseppe D'Angelo2020-06-091-18/+16
| | | | | | | | | | | m_glContext is left not initialized by the code (which had a merge resolution marker in the middle), and there's a connect() statement against it. This makes me think this code should initialize it, instead of just initializing ctx. Change-Id: Ia1cbd5630cc6aa7b047457a9c895d94f164f9204 Pick-to: 5.15 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Disable warnings-as-errors on targets that use AssimpMike Krus2020-06-091-1/+3
| | | | | Change-Id: I1b8789819a095fb3c16f275f4b4ce97ec5296e18 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Disable RHI backend for nowMike Krus2020-06-091-3/+3
| | | | | | | Currently break CMake build which needs to land soon Change-Id: Idae7ccb4ed91a136f4f386c1bfd6010cea4f2a95 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix more namespace ambiguityMike Krus2020-06-091-2/+2
| | | | | Change-Id: Ic823c29f369bd06480a0d0be8e7db87e9a1cf76e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Update dependenciesMike Krus2020-06-081-8/+8
| | | | | Change-Id: I5b8db0be7715039f6f2e3e436ecbd194e24c23c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix compile warnings related to deprecations or unused variablesPaul Lemire2020-06-085-14/+6
| | | | | Change-Id: I3d8fa0940a22f40bec3809b302cc59a40a5c3c52 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix QBuffer documentationPaul Lemire2020-06-081-9/+1
| | | | | Change-Id: Id612f8a2e2408265a0c2ac87e9a31aac41a60582 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix QBuffer::updateData being called several times in a rowPaul Lemire2020-06-085-8/+104
| | | | | | | | | | | | QBuffer::updateData would send a single update at the time and would overwrite the latest update if it was called again before synching with the backend took place. This patches fixes by storing a list of pending updates instead. Change-Id: I1fc501ad921c953ec88117fcc49c0cfcde6ca8aa Task-number: QTBUG-81921 Reviewed-by: Mike Krus <mike.krus@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 00:03:52 +0000