summaryrefslogtreecommitdiffstats
path: root/src/render/texture/qabstracttexture_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Update sendTextureChangesToFrontend to use direct syncPaul Lemire2019-10-071-0/+4
| | | | | Change-Id: I9356186ca27518c32ae189d7e432969b767612e9 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Update QAbstractTexture to use direct sync modeMike Krus2019-09-181-1/+1
| | | | | Change-Id: Iaac3196e9848c0a5a85e75cb61650813c1b70ab0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Merge remote-tracking branch origin/5.13 into devPaul Lemire2019-04-151-1/+1
|\ | | | | | | Change-Id: Ib5c04e9941aeea1a4cd27519b94b9a53e8349ea3
| * Switch export macros to standard formKai Koehne2019-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-201-0/+4
|/ | | | | | | | | | - 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>
* QAbstractTexture:: add handle and handleType propertiesPaul Lemire2018-10-101-0/+3
| | | | | | | | | | | | Will allow to retrieve the OpenGL texture id for textures created by Qt3D. Also completed tests along the way. [ChangeLog][Qt3DRender] QAbstractTexture: Expose raw texture handle and handleType to share with 3rdparty engines. Change-Id: I27d390c223303d9d11a418c2957aaae6ae1df850 Task-number: QTBUG-70055 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Add QSharedGLTexturePaul Lemire2018-10-081-0/+3
| | | | | | | | | | | | | QAbstractTexture subclass that will allow to make Qt3D work with a texture id created by another GL engine on a shared context. [ChangeLog][Qt3DRender] Add QSharedGLTexture to allow creating a Qt3D from an OpenGL texture id. Change-Id: Ic5b19eae6ebc7aca7e6372d62217348f99db19df Task-number: QTBUG-69918 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
* Add support for downloading texturesMike Krus2017-05-201-0/+1
| | | | | | | | | If the source url is remote, use the download service to download the data. Task-number: QTBUG-57614 Change-Id: I0dd9d7dc9728458858ea4a0a579c1799eb9ceaf0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add Qt3DExtras::QTextureAtlas classWieland Hagen2017-01-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | areallocator is copied from qtdeclarative/src/quick/scenegraph/util. We could link to QtQuick to use this allocator from the private headers, but this would introduce a hard dependency on QtQuick that Qt3DExtras doesn't yet have. Image data for texture atlasses are stored inside QTextureAtlasData structures, which are shared between 1. the frontend QTextureAtlas node, and 2. the texture generators that are updated each time something is added to the atlas If we didn't share this data, we would have to copy the current QImage that stores the current state of the texture atlas, each time that a new sub-image is added. This would result in considerable memory copying overhead. By sharing the data, we can just add new sub-images to the shared data structure, and update the texture generator. This may happen dozens of times within one frame. When the backend texture loading job is executed, it will copy all the new sub-images into the overall texture image, and create the texture data from that image. This way, exactly zero image copying overhead happens in the frontend thread. Change-Id: I8c418bf335afd1363ad7cefdf81778e4075038e8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTextureLoader: properly send new data functor notificationPaul Lemire2016-11-191-0/+3
| | | | | Change-Id: I3c3d07c86dc35cb4f208c2215f7b0993811783d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Texture backend refactoring: Add unit testWieland Hagen2016-11-141-1/+1
| | | | | Change-Id: Idca03006cd8201bbd3f9a379f6f8d1faaab8c0a8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Allow setting sample count for multisample targetsMauro Persano2016-08-121-0/+2
| | | | | | | | | Adds new property which allows you to change the number of samples per texel in a texture. Only used for multisample render targets (Texture2DMultisample and Texture2DMultisampleArray). Change-Id: I76934c3af125fb97f61e35cb4db84799bd17a6ab Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Make QTexture use QTextureSourceGeneratorPaul Lemire2016-05-201-2/+3
| | | | | | | Instead of using a QTextureImageDataGenerator which was confusing Change-Id: Ibbda6b2e8ddf6a917e1d1c0b1e086596c8c30510 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTexImageData to QTextureImageDataFranck Arrecot2016-05-031-1/+1
| | | | | | | | Adding unit testing to QTextureImageData Task-number: QTBUG-51478 Change-Id: Icacdf8e5ba953eb2e637e46b16845745d06bd3ae Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QVectorize QAbstractTextureWieland Hagen2016-04-161-2/+2
| | | | | Change-Id: I47db3ecbdb8146ffb0eb89792c3642a891e56d2e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractTexture creates creation changesSean Harmer2016-04-101-0/+21
| | | | | Change-Id: Ia164f44c53047c258c9e256fee20df0c8ecb9496 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QAbstractTexture: Remove unique propertyWieland Hagen2016-04-071-1/+0
| | | | | | | | | | Instead, automatically reason about unique-ness of texture based on texture data. This should make exactly those textures unique, that don't have any image data associated with them. Task-number: QTBUG-51507 Change-Id: I172ac1d52a46ef8ccf3122d5a8acbdf54296da0f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractTextureProvider property and enum changesRobert Brock2016-04-071-1/+1
| | | | | | | | | | Added None status Renamed Loaded status to Ready renamed maximumLayers to layers Change-Id: Ide2b944780e019f5ee0fd07ae72672da22f23991 Task-number: QTBUG-51479 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractTextureProvider renamed to QAbstractTexturePaul Lemire2016-04-061-0/+96
Change-Id: If8ea2c9806e28f6d97eb3fb852686647c0c04d8f Task-number: QTBUG-51504 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>