summaryrefslogtreecommitdiffstats
path: root/src/render/io/texturedata.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix image format for texturesLaszlo Agocs2015-02-111-3/+3
| | | | | | | | | | | | | | We always convert to RGBA8888 so the only acceptable combination is GL_RGBA - GL_RGBA8. Previously we were checking the presence of the alpha channel in the original image. This is quite wrong since we end up with GL_RGBA - GL_RGB8 type of combinations in case the input has no alpha. That is not a valid combination. This makes images without an alpha channel, e.g. image formats that provide Format_RGB32 QImages, working. Change-Id: I2631071134c5224c52b64cff2f00ef6ae166762b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Copyright header change.Mika Salmela2015-02-091-19/+14
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Texture API refactoringPaul Lemire2015-02-081-11/+11
| | | | | | | | | | * Added LoadTextureDataJob * QAbstractTextureProvider: maximum layers property * Automatic QAbstractTextureProvider::TextureFormat added * material-qml should work perfectly with that patch. Change-Id: I3f92f13b783155798772086304a30126a4fc687d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* TextureData add setter for CubeMapFacePaul Lemire2015-02-081-0/+5
| | | | | Change-Id: I91694d6b9b241d3dfe24e114455332085c99c656 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* TextureData pass parameters by const ref instead of valuePaul Lemire2014-06-281-3/+2
| | | | | Change-Id: I7b278d4d7c4c463f5daeb167fc5ff41337c293ba Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Replaced QmlTexture by Quick3DTexturePaul Lemire2014-05-301-93/+0
| | | | | | | | | Separated Texture from TextureData. Quick3DTexture is a sublcass of Quick3DNode and Texture. This is part of a serie of patches aimed at specifying how Uniforms and Textures are going to be defined from QML. Change-Id: Ia1a9acfc4d9b07299a103bdbbffcc34aa4b79177 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix builds with namespaced QtSean Harmer2014-04-021-0/+4
| | | | | | Change-Id: I15a4a472f5283c56c8185b05699e33368c45ddb0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Relocate the render aspect outside of coreSean Harmer2014-03-291-0/+167
| | | | | Change-Id: I636442d2d71342fd248b90674176cede895feab2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Import initial examples and export symbols from libSean Harmer2014-02-251-167/+0
| | | | | Change-Id: I6eb7c66cb96956e3cb3e1d319a82a08a0fd3c37a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Initial import of Qt3DCore and Renderer aspectSean Harmer2014-02-101-0/+167
For now the renderer aspect is still compiled into the Qt3DCore library. This needs to be split out into a plugin so it can be loaded dynamically along with other future aspects. Change-Id: Iba8402b35c7ebc1c503d438c87aad77f5fef2261 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>