summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph
Commit message (Collapse)AuthorAgeFilesLines
* Unify license header usageAntti Kokko2016-01-2687-962/+1223
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Renderer/Scene3D: fixes to make it work without setDataPaul Lemire2016-01-221-1/+2
| | | | | Change-Id: Iec1d3bab2e3a5a25d1cbb5129addebd83b225580 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Port FrameGraphManager away from QResourceManagerTobias Koenig2016-01-203-61/+41
| | | | | Change-Id: I7399008adb0f612c78738f58f168fa38cf6ae845 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add window convenience property to QRenderSurfaceSelectorSean Harmer2016-01-183-1/+30
| | | | | | | | | | Behind the scenes this just updates the QSurfaceProperty which is all we care about on the backend. This is for QML since QSurface is not a QObject subclass (even though all sub classes of QSurface are via MI, grrrrr). Change-Id: I248eb59a92ed3bc99361ff23a0cd20d3c191769b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add RenderSurfaceSelectorNode to frame graph backendSean Harmer2016-01-174-3/+165
| | | | | Change-Id: Ibd50fe11628d766588097a684be9e46254a5371b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add QRenderSurfaceSelectorSean Harmer2016-01-174-2/+248
| | | | | Change-Id: I65fbfed5bcf244668021878c0cfddb75d530e56e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* RenderView Compute handlingPaul Lemire2016-01-131-0/+3
| | | | | Change-Id: Ifbe93173010bf058f198990c62d5e93fea967a74 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use QList::reserve.Volker Krause2016-01-061-0/+1
| | | | | | | | The intermediate QLists are still not optimal here, as these methods are called per frame, but at least this is now down to one allocation each. Change-Id: I7705172aabc5e526c5123d70450d3ae2dec20d03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added parameters to signals and made setters Q_SLOTSTomi Korpipää2015-12-0916-24/+39
| | | | | | Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* BackendNode for QComputeDispatchPaul Lemire2015-12-074-3/+179
| | | | | Change-Id: I41a027b073ee5cb253f7b37244ad887acff4f909 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add QDispatchCompute framegraph nodePaul Lemire2015-12-073-2/+216
| | | | | | | | Will be used to dispatch a compute job if the renderer is compatible with compute shaders (OpenG 4.3) Change-Id: I7846d3b58d6aed06276aa34e841245ce1154fdd8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a framegraph node for lightingLaszlo Agocs2015-11-267-3/+370
| | | | | | | Empty for now. Change-Id: I4edcdae58230e53c266c214052522d3ab54b1c6c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* FrustumCulling backend framegraph nodePaul Lemire2015-11-244-3/+164
| | | | | Change-Id: Ied917f0ffb9d63d5a3a6bd61a9e6be1241c0ef8b Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add QFrustumCulling framegraph nodePaul Lemire2015-11-243-2/+121
| | | | | Change-Id: I6bdee01f898a477c4c24457de6ab774e03277365 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QRenderAspect/Renderer: refactored to use the AbstractRenderer interfacePaul Lemire2015-11-242-3/+4
| | | | | Change-Id: I662577e6dd337b1f056f73b4a11262e902d4dde2 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Doc: Fix QDoc warnings and do further cleanupTopi Reinio2015-11-237-33/+45
| | | | | | | | | Fix the documentation issues that still remained broken after renaming the namespaces/QML modules. Do further cleanup and minor doc editing. Change-Id: Iff38c8c1b99e7f712dc3f9ad07ecd37a747b3a26 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Qt3DRender::QLayerFilterPrivate: Remove unnecessary exportAndy Nichols2015-10-301-2/+1
| | | | | Change-Id: I1b42afc740da696bd019b4c0c34a9cc23e5769c0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAspectManager: Explicitly mark as private APIAndy Nichols2015-10-302-2/+0
| | | | | | | Also remove some unnecessary includes. Change-Id: I35539566e530f7800bbbe7884be65a93a7ee91eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* d-pointer classes, private/public changesTomi Korpipää2015-10-301-1/+1
| | | | | | Change-Id: I4ca133aebad0c088296ab293f95f0a6d76d18395 Task-number: QTBUG-39946 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Updated the docs for the namespace changesVenugopal Shivashankar2015-10-278-8/+8
| | | | | | | | | | | | | | | | Each of the submodules now have there own namespace so the following changes are required to adapt: - Added \namespace docs for the new namespaces. - Updated all the \class and \instantiates entries to use the appropriate namespace qualifier. - Changed the \module and \qmlmodule names for Qt 3D Core and Qt 3D Render modules. - Added the missing \module and \qmlmodule pages for the Qt 3D Collision module. Change-Id: Ibc5bf30e4f50aecb6a3b24bc8536f17ed19d681d Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Rename Renderer -> Render throughoutSean Harmer2015-10-1949-90/+90
| | | | | | | | This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Few improvements on FrameGraphNodePaul Lemire2015-10-142-6/+19
| | | | | | | | | | * Exported with Q_AUTOTEST_EXPORT for unit testing * Check if parent is different in the setParentHandle * Set parent handle to null when removing child * Add a getter on the manager Change-Id: Idbe20fd36d144023c2f4e7a1571122038bda8a3d Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QViewport fix: properly copy color when cloningPaul Lemire2015-10-141-0/+1
| | | | | Change-Id: I4cd0fa73e06224b023215cef57efbb6b2fbbc30d Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QTechniqueFilter fixes:Paul Lemire2015-10-143-18/+22
| | | | | | | | | - Properly clone the parameters when doing a clone - Sent QAnnotation QNodeId only, not clones - Check that a QAnnotation is not already contained when inserting a new one Change-Id: Ie00410c107b41bebccccd670feb02e2bfd30b84e Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add a comment in QStateSet to explain why we are sending clonesPaul Lemire2015-10-141-0/+1
| | | | | Change-Id: I6446f3712339cb040db6508cfb14e15a475c0889 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QSortMethod: only send criterion node id and not node pointersPaul Lemire2015-10-142-6/+6
| | | | | Change-Id: Ief517b0554a400427b211b8b05f96926307dbbe3 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QSortCriterion fix: do not pass ref for sort type but valuePaul Lemire2015-10-142-3/+2
| | | | | Change-Id: I415a47cea4ff393ca67c3f162415d5a082c66d0a Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QRenderTargetSelector fixes:Paul Lemire2015-10-141-1/+2
| | | | | | | | - Property copy drawBuffers when cloning - Check that the target isn't null when we try to set its parent Change-Id: I61b1f8972f9813efa371b929b26490d0a0b577c2 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QRenderPassFilter fixesPaul Lemire2015-10-143-8/+10
| | | | | | | | - Only pass the id (to avoid clones) when an annotation is added - Make clones of the parameters when a QRenderPassFilter is cloned Change-Id: Id7e19f11d35ea5d891ce2a031c872400a8550197 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QFrameGraph: check that activeFrameGraph is not nullPaul Lemire2015-10-141-1/+1
| | | | | | | Otherwise we try to set the parent on a null object Change-Id: I0dff1a8374dd1540bddb109b112ea73081db0f39 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* QCameraSelector: fix allow camera to be nullPaul Lemire2015-10-141-1/+1
| | | | | Change-Id: Idcbe72c55134c2beb6e226d963a8e724ce210738 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-1355-178/+178
| | | | | | | Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add "We mean it" warnings to private headersSean Harmer2015-10-1327-2/+299
| | | | | Change-Id: Ic4a69123255c33990765ea3601e01914c2d8cb70 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Final batch of file moves for nowSean Harmer2015-10-1370-0/+6297
Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>