summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/parameter_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-231-20/+20
| | | | | | | | | | | This reverts commit 03e5f60e585701608c1181365faee484d7a1f14c. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I359e89ed77b1b2750607617d138ebb6c316f0296 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update commercial license headersTarja Sundqvist2021-02-021-20/+20
| | | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qt3d. Examples, documentation files or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4155 Change-Id: I139c8ad72c042b0900239decc36cfed4bc1c4951 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Make the OpenGL renderer a pluginPaul Lemire2020-02-051-1/+1
| | | | | | | | By default the QRenderAspect will try to load this plugin Change-Id: Ie55e207fb8e6d0b64f717bbb99699eb669eaa3f2 Task-number: QTBUG-61151 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix in parameters: backend value wasn't reset on cleanupPaul Lemire2019-10-031-0/+1
| | | | | | | | Lead to a regression where some uniforms wouldn't have the expected value following destruction/reconstruction of the backend Parameter. Change-Id: Id747cb2903f25a4a5cc0c5d479a09805d317f380 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update QParameter to use direct syncMike Krus2019-09-191-3/+2
| | | | | Change-Id: Iea1a2db5d4bcd2ef563993a434bf8e2166d64ed5 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Replace Q_DECL_FINAL with finalKevin Funk2017-09-251-1/+1
| | | | | Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-1/+1
| | | | | Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Return the Uniform as a const reference to avoid expensive copiesLars Knoll2017-09-061-2/+2
| | | | | | | And inline the nameId() and uniform() getters. Change-Id: I4c30a6fa36a6e5a7e621d3fad91d88adfcfda185 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Parameter: export for unit testsPaul Lemire2016-11-191-1/+1
| | | | | Change-Id: I33c83fe5cec240bdc465787f32708683c4b82ae4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Parameter: add a cleanup methodPaul Lemire2016-11-191-0/+2
| | | | | Change-Id: I13bab1a6f5cc983e403b039ed24ef3db8c5ac5c2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Texture backend refactoring: Update node managersWieland Hagen2016-11-141-1/+0
| | | | | Change-Id: Ieacdf3115d5a823060b513bf28c5ec9bb4f44b43 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Parameter: only store a UniformValuePaul Lemire2016-09-141-2/+0
| | | | | | Change-Id: I6614c05fabb4fde72973a0e4738eb86efad7cc14 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Parameter: store a UniformValuePaul Lemire2016-09-071-0/+3
| | | | | | | Should soon allow to get rid of QVariant Change-Id: I85b37fd013523eecdccb747d2835b5d25145022a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replace Q_DECL_NOEXCEPT by Q_DECL_NOTHROWPaul Lemire2016-05-231-1/+1
| | | | | | Change-Id: Ia991da557483704055e0ccf17b4a6b273568a1ba Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Remove QBackendNode::updateFromPeer()Sean Harmer2016-05-031-1/+0
| | | | | | | | | | Implemented a few missing initializeFromPeer() implementations along with the corresponding frontend node creation change creation functions. Adapted unit tests. Change-Id: I571e53a7b68a5544bd0e308df0baf7e52533306e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Parameter handles creationSean Harmer2016-04-051-0/+2
| | | | | | | | Remove value from QParameterData as backend doesn't care about this. Change-Id: I91d879f275deeec58c720f52d79359e8930da1bb Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Dedicated QRenderBackendNodeWieland Hagen2016-02-241-2/+2
| | | | | | | | | Render aspect Backend nodes now subclass from QRenderBackendNode, which is a subclass of QBackendNode. We may want to store aspect- related data in each backend node Change-Id: I4f00de09c8cc31d2347d919151d359ad44cf03a9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderView: various small fixes in things frequently calledPaul Lemire2016-02-211-1/+1
| | | | | Change-Id: Ib81db6fd387853069cc7bda1206ff5ef95a377c2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* RenderViews: use int comparison rather than string for uniforms filteringPaul Lemire2016-02-211-0/+2
| | | | | | | Provides a non negligible gain in performance. Change-Id: I1165d1fcd044e3bdebf286539da2f5316f764540 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Unify license header usageAntti Kokko2016-01-261-11/+14
| | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I8eac0cd6bbc276a56df487249cc459c0d4fab165 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* QParameter: only copy QNodeId when parameter value is a QNodeSubclassPaul Lemire2016-01-131-8/+0
| | | | | | | | | | | | | This avoid doing useless clones and will be further improved to support UBO/SSBO when Buffer are used as a Parameter's value. QNode subclasses that can be used as the value of an attribute are: QAbstractTextureProvider -> default uniform block QShaderData -> UBO (could be made to work with SSBO as well) Buffer -> UBO / SSBO Change-Id: I4928b95107656afc64db1ef989dde5dde8a92df8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move Qt3DCore into Qt3DCore namespaceSean Harmer2015-10-131-3/+3
| | | | | | | 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-131-0/+11
| | | | | Change-Id: Ic4a69123255c33990765ea3601e01914c2d8cb70 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Move material system into own directorySean Harmer2015-10-131-0/+83
Change-Id: Iddc3a5d41dc0aff858d8bc3c5b2f7982bd693d00 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>