summaryrefslogtreecommitdiffstats
path: root/src/render/texture
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgplTarja Sundqvist2024-01-041-0/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I69854c833d45b39b1b0ccdb2c289162cd23d51a7
| * QPaintedTextureImage: fill image with transparency by defaultPaul Lemire2023-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | Avoids having junk in the texture on the first paint call if not filling a rectangle with a QPainter. Change-Id: Icb65b6f994a9edea5132a2c54406fa0dd817bcb2 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 20d36f07fa7815fb7a05018c93602932e600397b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-096-2/+14
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I81f01dbde95cc9cd8e98c7fb9bf3a390aa27f379
| * Qt3DRender: includemocsMike Krus2022-07-156-0/+12
| | | | | | | | | | | | | | | | Task-number: QTBUG-103286 Change-Id: Iaddad08bb469408ee975e463ac82c95870130cee Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 1e940bf2f8d260c313917718584736fa9fa86b14) Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * Fix various [=] lambda captures to capture [this] insteadMarc Mutz2022-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | C++20 deprecated the implicit capture of [this] in [=]. Move Q_D()s into the lambdas, where applicable. Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 42f96fe2074bc63cfb8a4ae71a7262d554661da2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2333-651/+651
|/ | | | | | | | | | | 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-0233-651/+651
| | | | | | | | | | | | | | | | 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>
* Add mipmaps count to QAbstracTexturePrivateJuan José Casafranca2020-11-053-0/+3
| | | | | | | Change-Id: Iaec05eb3d7d8647af14d2e155673dd25c3dae994 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 0fa4099b4fde67e381564509e17892965c53b779) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Expand QPaintedTextureImage documentationMichael Brasser2020-10-221-2/+15
| | | | | | | | | Also make use of the newly documented pattern in the manual test. Change-Id: Idefe271eea345848af3817e08ac5b45946843dad Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 3d2d67b571b0f6ed3df1c0d3eeed1e89097bef57) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Pass the raw data to the texture data extractorJuan José Casafranca2020-10-022-4/+5
| | | | | Change-Id: If6ca151b22f442985df1ff34108ca0bd216ebf47 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Allow to specify a functor to extract data from QTextureImageDataJuan Casafranca2020-09-282-0/+16
| | | | | Change-Id: Idd052f6c24665a1accd2cd681c80fe74846e5c39 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Allow to set alignment requirement for an imageJuan Casafranca2020-09-282-0/+3
| | | | | Change-Id: Ifffbfd80a3d99b43e348e12bea62e3c90eed80c4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* 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>
* | 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>
* | 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>
* | QTextureDataUpdate: fix since version in docPaul Lemire2019-09-191-0/+1
| | | | | | | | | | | | Task-number: QTBUG-77839 Change-Id: I74536102f97919e3d1d27e68fae4cc6936c10c36 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update QAbstractTexture to use direct sync modeMike Krus2019-09-185-98/+70
| | | | | | | | | | Change-Id: Iaac3196e9848c0a5a85e75cb61650813c1b70ab0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | QTextureUpdateData: make fit for releaseMarc Mutz2019-08-283-65/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - use CoW/QExplicitlySharedDataPointer - add member-swap and free swap - add noexcept move assignment - use NSDMI for Private, consequently default its ctors - default Public special member functions - make relational operators non-members and noexcept - make inequality operator inline Fixes: QTBUG-77857 Change-Id: Ifcd4fb27203c7f8ccb2bdb2856252ed38be46557 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix some qdoc warningsFriedemann Kleint2019-08-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/render/materialsystem/qshaderimage.cpp:315: (qdoc) warning: Unexpected '\endlist' src/render/materialsystem/qshaderimage.cpp:342: (qdoc) warning: Missing '\endtable' src/render/materialsystem/qshaderimage.cpp:731: (qdoc) warning: Unknown command '\defaut' src/render/materialsystem/qshaderprogrambuilder.cpp:361: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:vertexShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:361: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:vertexShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:367: (qdoc) warning: Cannot find 'QShaderProgram:Builder:vertexShaderCode' specified with '\property' in any header file src/render/materialsystem/qshaderprogrambuilder.cpp:379: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:tessellationControlShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:379: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:tessellationControlShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:385: (qdoc) warning: Cannot find 'QShaderProgram:Builder:tessellationControlShaderCode' specified with '\property' in any header file src/render/materialsystem/qshaderprogrambuilder.cpp:397: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:tessellationEvaluationShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:397: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:tessellationEvaluationShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:403: (qdoc) warning: Cannot find 'QShaderProgram:Builder:tessellationEvaluationShaderCode' specified with '\property' in any header file src/render/materialsystem/qshaderprogrambuilder.cpp:415: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:geometryShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:415: (qdoc) warning: Unrecognizable QML module/component qualifier for string ShaderProgramBuilder:geometryShaderCode src/render/materialsystem/qshaderprogrambuilder.cpp:421: (qdoc) warning: Cannot find 'QShaderProgram:Builder:geometryShaderCode' specified with '\property' in any header file src/render/materialsystem/qshaderprogrambuilder.cpp:439: (qdoc) warning: Cannot find 'QShaderProgram:Builder:fragmentShaderCode' specified with '\property' in any header file src/render/materialsystem/qshaderprogrambuilder.cpp:457: (qdoc) warning: Cannot find 'QShaderProgram:Builder:computeShaderCode' specified with '\property' in any header file src/render/texture/qtexture.cpp:1610: (qdoc) warning: Class QSharedGLTexture has no \inmodule command; using project name by default: Qt3D src/render/texture/qtexturedataupdate.cpp:82: (qdoc) warning: Class QTextureDataUpdate has no \inmodule command; using project name by default: Qt3D src/render/materialsystem/qshaderimage.cpp:413: (qdoc) warning: '\brief' statement does not end with a full stop. src/render/frontend/qpickingsettings.cpp:194: (qdoc) warning: No such enum item 'PriorityPick' in Qt3DRender::QPickingSettings::PickResultMode src/render/materialsystem/qshaderimage.cpp:413: (qdoc) warning: '\brief' statement does not end with a full stop. src/render/materialsystem/qshaderimage.cpp:734: (qdoc) warning: Can't link to 'OpenG specifications' src/render/materialsystem/qshaderimage.cpp:63: (qdoc) warning: '\brief' statement does not end with a full stop. Change-Id: Id7a2752895b2a889a6aefdbabac42d4502dc5b7b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | QImageTextureDataFunctor: return invalid data when url is invalidWang Chuan2019-08-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QSkyboxEntity creating empty cube map first and using QTimer to delay loading real cube map, in render thread, GLTexture will use the generator function of empty cube map to generate a QTextureImageDataPtr at first, this will set the format of property of GLTexture to NoFormat, and terminate the creation of GLTexture. Although GLTexture read real real cube map next time, format will not be reset and the creation of GLTexture terminates. [ChangeLog][Qt3DRender][QImageTextureDataFunctor] return a invalid image data when url is invalid to ensure the property of GLTexture will not be set to NoFormat Fixes: QTBUG-74017 Change-Id: If48f727dba817a931d618b2b88c7ebd54c508c47 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Basic KTX support for Qt 3DMichael Brasser2019-07-093-10/+173
| | | | | | | | | | | | | | | | | | | | Adapt the KTX loading code from Qt 3D Studio. Currently only supports a limited subset of texture types. [ChangeLog] Add basic support for KTX container format. Change-Id: Iccad368ed5db571f1f896fb77889db16b8d4b794 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-251-13/+16
|\| | | | | | | Change-Id: Ib1f5677a99f63b15c3990fea130c8bbe946f31ff
| * Add doc to undocumented functions qt3dNico Vertriest2019-05-271-13/+16
| | | | | | | | | | Change-Id: Ic5183b31ee0df54e7a99a48f71ac04fc648f92e2 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Paul Lemire2019-06-031-2/+14
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into devPaul Lemire2019-06-031-2/+14
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/renderers/opengl/renderer/renderer.cpp tests/auto/render/textures/tst_textures.cpp Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-261-2/+14
| | |\ | | | | | | | | | | | | Change-Id: I4a35126d98e04ed228e5b3a4ed9157995bef3a0a
| | | * Doc: Add TextureLoader QML documentationPaul Wicking2019-05-151-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-73072 Change-Id: I66da2ab446d34b4385b883d640640263c15ad205 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | Fix in TextureFormat for RGB10A2Paul Lemire2019-06-052-1/+4
|/ / / | | | | | | | | | | | | | | | Change-Id: I55258e1be54bd628572aa134b62f6c07fb90ef2c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch origin/5.13 into devPaul Lemire2019-04-1516-28/+28
|\| | | | | | | | | | | Change-Id: Ib5c04e9941aeea1a4cd27519b94b9a53e8349ea3
| * | Switch export macros to standard formKai Koehne2019-04-0215-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Also remove non-exising QT3DLOGIC_PRIVATE_EXPORT macro from src/doc/qt3d.qdocconf Task-number: QTBUG-74752 Change-Id: I71b9e85ff09c002fb283824aa51a5a8f50e937f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Make it possible to partially update a texturePaul Lemire2019-03-209-11/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce QTextureDataUpdate which contains information about the update - QAbstractTexture::updateTexture function added - Add manual test texture-updates-cpp - Add unit tests for GLTexture and complete other texture tests Change-Id: I1b792f2075830ce05cc8e04cc68110141b5571d6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-092-4/+4
|\| | | | | | | | | | | Change-Id: I8daaee9c3a2667893be118613979bc7e07e26147
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 11:29:03 +0000