summaryrefslogtreecommitdiff
path: root/src/render/texture
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie Gérard2022-06-2233-1254/+66
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I8105424281eed871037fa6c463871ca8829876b5 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2f1bc82b35209aacd8d214a3c7e8e725bee85de6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Qt3D: replace qSwap with member-swap where possibleMarc Mutz2022-05-161-1/+1
| | | | | | | | | | | | | qSwap() is a monster that looks for ADL overloads of swap() and also detects the noexcept of the wrapped swap() function, so it should only be used when the argument type is unknown. In the vast majority of cases, the type is known to be efficiently std::swap()able or to have a member-swap. Call either of these. Task-number: QTBUG-97601 Pick-to: 6.3 6.2 Change-Id: I1f27dc458f2d57a71070e818583f2e90c82e600d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Remove uses of deprecated {QByteArray, QString}::count()Sona Kurazyan2022-04-271-1/+1
| | | | | Change-Id: Ic2da884f11d7578c9972e779fd350a0135e55431 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-082-2/+3
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPEAndreas Buhr2020-12-221-1/+1
| | | | | | | | | | | | | Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in Qt3D. As the two are synonymous, this patch should have no impact on users. Task-number: QTBUG-86829 Change-Id: Ie63323a692e8937fa72f0225b48ccb703f479c47 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Handle changes in OpenGL classesMike Krus2020-11-271-0/+4
| | | | | | | Support building against both 5.15 and 6 Change-Id: I46e15f2f898f5f2304075e290798d3d2aea47dad Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Doc: Fix documentation warningsTopi Reinio2020-11-252-20/+10
| | | | | | | Pick-to: 6.0 6.0.0 Fixes: QTBUG-88842 Change-Id: Ie8ea1914c5e740c0c4bf25f4754a008aff6401cd Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QAbstractTexture: expose mipLevelPaul Lemire2020-11-243-1/+30
| | | | | | | | | This is supposed to be exposed for Qt6 Pick-to: 6.0 Pick-to: 6.0.0 Change-Id: I3fefcd706ca16328946f33d665055dfe2a4c3563 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Add mipmaps count to QAbstracTexturePrivateJuan José Casafranca2020-11-053-0/+3
| | | | | | Pick-to: 5.15 Change-Id: Iaec05eb3d7d8647af14d2e155673dd25c3dae994 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix taking pending texture data updatesJuan José Casafranca2020-11-051-1/+2
| | | | | Change-Id: Iea9fee79797bf005938d13436d83726c1c7c837a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Replace old Q_DECL statements with modern C++Allan Sandfeld Jensen2020-11-022-48/+48
| | | | | | | | Since we have long depended on C++11 now, all of these can go. Change-Id: I8808af2cd5ce192864c636b521dadd7de189563b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Pass the raw data to the texture data extractorJuan José Casafranca2020-10-273-6/+7
| | | | | | Change-Id: If6ca151b22f442985df1ff34108ca0bd216ebf47 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 6fdf835639e56c68ae01da894c7d2b9f552dd87d)
* Expand QPaintedTextureImage documentationMichael Brasser2020-10-221-2/+15
| | | | | | | | Also make use of the newly documented pattern in the manual test. Pick-to: 5.15 Change-Id: Idefe271eea345848af3817e08ac5b45946843dad Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Allow to specify a functor to extract data from QTextureImageDataJuan Casafranca2020-09-283-0/+26
| | | | | Change-Id: Idd052f6c24665a1accd2cd681c80fe74846e5c39 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Allow to set alignment requirement for an imageJuan Casafranca2020-09-283-0/+25
| | | | | Change-Id: Ifffbfd80a3d99b43e348e12bea62e3c90eed80c4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* qtextureimagedata.h: Fix include directiveFriedemann Kleint2020-09-171-5/+1
| | | | | | | | Add the module, which is required by convention and for Qt for Python to build. Change-Id: I9555aa3bed87c5b2377e7a51f6d52b60ecb16aa1 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix compilation with newer qtbaseFabian Kosmale2020-08-251-0/+1
| | | | | Change-Id: Iaba2780c2ac28181cce15ae350fadd755a51999f Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Use QList instead of QVector in renderJarek Kobus2020-07-092-7/+7
| | | | | | | | | Use list-initialization. Task-number: QTBUG-84469 Change-Id: I826450646fc3c7118cae49c22a28058f47770e13 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use QList instead of QVectorJarek Kobus2020-07-074-5/+5
| | | | | | Task-number: QTBUG-84469 Change-Id: Ic726ce85e01190dbc64426388fd454c54ae3c3e3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* GLTexture: change internals to use std::vectorPaul Lemire2020-07-071-2/+2
| | | | | Change-Id: If680702aed4544395866a7b376db920561bf16cc Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-241-1/+1
| | | | | | | | 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>
* Fix compile warnings related to deprecations or unused variablesPaul Lemire2020-06-081-1/+1
| | | | | Change-Id: I3d8fa0940a22f40bec3809b302cc59a40a5c3c52 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Fix build for Qt6Mike Krus2020-05-061-1/+1
| | | | | | | | | | | | | - updated dependencies, excluding qtgamepad for now - fixed issues with Q_PROPERTY not supporting forward declarations - fixed for changes in QtQuick private API - fixed for changes in QtOpenGLVersionFunctions API - fixed for removal of QT_OPENGL_ES* macros - fixed for changes in QtConcurrent API - fixed RHI based build Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch 'origin/5.15' into devMike Krus2020-04-271-1/+2
|\ | | | | | | Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
| * Merge remote-tracking branch 'origin/5.14' into 5.15Antti Määttä2020-04-211-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h src/plugins/renderers/opengl/renderer/renderer.cpp src/render/backend/attachmentpack_p.h src/render/frontend/qrenderaspect.cpp src/render/picking/qabstractraycaster.cpp tests/manual/manual.pro Change-Id: I617b7e34bf7e11b2921bfc15e1b99c3e81891ec7
| | * Check we remove a valid node when removing from node propertiesPaul Lemire2020-02-101-1/+2
| | | | | | | | | | | | | | | Change-Id: Ibcc4d9bfd9d0a9d7697151915f24a6eecc149f6d Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Geometry refactoringMike Krus2020-02-275-8/+8
| | | | | | | | | | | | | | | | | | | | | Move QBuffer, QAttribute, QGeometry to Qt3DCore. Change-Id: I59dfd091eefadcada93350b3aba955f40b304385 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Merge remote-tracking branch 5.15 into devMike Krus2020-02-171-2/+6
|\ \ \ | |/ / | | | | | | Change-Id: I2777f6a40b9029ef5569a84e04f9e18a914504e7
| * | Restore include of QOpenGLTexture for Qt 5 in public headerv5.15.0-alpha1Friedemann Kleint2020-02-101-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The module path needs to be specified for Qt for Python to build. Amends 0159963cf5072e05d068fd7a9b58085ac70021c1. Change-Id: I5b030752cbe321d293985167e665cdcdc0c4c230 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | | Hide deprecated functor APIMike Krus2020-02-1211-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now private for QTextureGenerator and QGeometryFactory updates. QTextureImageDataGenerator remains for now as it was not previously deprecated and, mainly, it's the only API to get data into an image. Consequently, QAbstractFunctor has been un-deprecated. Change-Id: Ie6691bc402ad603d63abcf1ec9fc3513091f5740 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Remove unused data structuresMike Krus2020-02-112-32/+0
| | | | | | | | | | | | | | | | | | | | | Was used by old node init API Change-Id: I7b68f25634ee7aaccefab6f499ac074fcfb9a7f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Remove deprecated classes and functionsPaul Lemire2020-02-1110-158/+11
|/ / | | | | | | | | | | | | Mostly old messaging API Change-Id: I17eb2206b2ede56d2f7d36375d5e711d6149019f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Remove QtGui module path from OpenGL related pathsMike Krus2020-02-061-1/+1
| | | | | | | | | | | | | | | | Many are moving to opengl module in qt6, will make merging easier. Change-Id: I0ad08510e6999a5d887d9197fe2cb0dc21919fb9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Make the OpenGL renderer a pluginPaul Lemire2020-02-056-5/+233
| | | | | | | | | | | | | | | | 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>
* | Add dedicated managers holder for GL ResourcesPaul Lemire2020-02-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | That way NodeManagers only refers to managers holding nodes (so can be used by aspect and all renderer) and GLResourceManagers refers to renderer specific resources. Note: the Scene2D resourceaccessor was making direct access to GL resource through the managers, this has been commented and will be restored later. Change-Id: Ic32784f60eac35aab8c066d1769f078639fa25b8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Deprecate functor APIsMike Krus2020-01-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Deprecate functor based APIs for buffer generators, geometry factories, texture data generators and mesh loaders While these are useful for some of Qt3D's internal mechanisms, they complicate some of the backend operations. Will delete some or make them private in Qt6. Change-Id: I64eaa338e0306647867d2084819ef8591e2c91c0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix usages of text stream operatorsAlexandru Croitor2019-12-062-2/+2
|/ | | | | | Change-Id: I8f3fe9475749f10f33c8eb750befa8845ccc37d6 (cherry picked from commit 58db7d01e0d424fdf46baa70e2e41b8009429c78) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove redundant std::moveThiago Macieira2019-11-131-1/+1
| | | | | Change-Id: Iad959315ad374ef288f5fffd15d6d4716cb28052 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Doc: Fix documentation warningsTopi Reinio2019-11-133-11/+12
| | | | | | | | | | | | | | | | | | | | | | | - Add (basic) documentation for Qt3DAnimation::QAnimationCallback. - Add missing namespace qualifiers for \class, \fn, \instantiates, \sa, and \property commands. - Remove linking to example file pages, as QDoc no longe treats them as linkable targets. - Fix function/QML method parameter documentation - Fix missing \qmlproperty types - Fix linking to QKeyEvent in QtGui. - Move Qt3DRender::Quick namespace documentation to where QDoc can see it. - Add enum documentation for Qt3DRender::QBlitFramebuffer::InterpolationMethod and Qt3DRender::QMesh::Status. - Other minor fixes This brings the current warning count to zero. Fixes: QTBUG-79822 Change-Id: I1154a7f9c34917a3f240e99da0e7a300be7d65a0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix status change on QTextureLoaderMike Krus2019-10-302-10/+10
| | | | | | | | | | | Now setting to Loading when the functor change is synced to the backend. Avoid creating a new functor when downloads have completed, just use the same one and mark the node as dirty. Avoid recreating the functor when the format change comes from the backend (which caused the image to be loaded again). Change-Id: Ifcbbf54db56b57a58b0b5d1ce5f1475b6587f697 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix Coverity warningsMike Krus2019-10-211-4/+4
| | | | | Change-Id: I00c875b48d838170fddf0b92f0ac5592828c6f0f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch '5.13' into 5.14Paul Lemire2019-10-172-0/+185
|\ | | | | | | Change-Id: I39797b5e48cb627638443e20eed207af6ae86c9c
| * Add QML doc for texturesPaul Lemire2019-10-162-0/+185
| | | | | | | | | | Change-Id: I649cf174ff59c64358d13c762eeb500521f712ce Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | QTextureLoader: reset target and format on source changePaul Lemire2019-10-161-0/+5
| | | | | | | | | | | | | | | | Could otherwise prevent reloading the content of the texture when the generator/source changes Change-Id: I5cf3389792032ba7a85a111f04dd4670a3091683 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update QAbstractTexture message handlingMike Krus2019-10-113-63/+11
| | | | | | | | | | Change-Id: I5c0ff05d405766b2e0aee992ee1c150b5a0cf059 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update sendTextureChangesToFrontend to use direct syncPaul Lemire2019-10-075-83/+40
| | | | | | | | | | Change-Id: I9356186ca27518c32ae189d7e432969b767612e9 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Clean up includesMike Krus2019-10-012-2/+0
| | | | | | | | | | | | | | | | | | Remove include statements for classes that are no longer used. Makes it easier to find remaining use cases that need addressed before complete removal in Qt 6. Change-Id: I60529ba1929ad64b162d3847d5df47cde2a60dad Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-301-2/+23
|\ \ | |/ | | | | | | | | | | Conflicts: src/render/texture/qtexture.cpp Change-Id: Ibc0b8d87c172ea8fac521b2c85d2b2a42c5fc290
| * Doc: Fix documentation issues for Qt3DRender::QTexture* classesTopi Reinio2019-09-271-2/+24
| | | | | | | | | | | | Fixes: QTWEBSITE-878 Change-Id: I8a4ac1de75dfb8ec4ff784a01d3e4abbc031a7ba Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Update QAbstractTextureImage to use direct syncPaul Lemire2019-09-254-28/+37
| | | | | | | | | | Change-Id: Ide55f36fc7e1ac197313307a1c3e58c06ac690a1 Reviewed-by: Mike Krus <mike.krus@kdab.com>
View Lorry Controller Status