diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:01:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:01:56 +0100 |
| commit | 59c18801b129ee81487ebd842641cecd0ce18508 (patch) | |
| tree | d21482daf90ad75897b1957090de35b92bd41976 /src/render/texture/texture_p.h | |
| parent | cc4c126d29e43c51e16a1c3fdcc0c7987e84ee42 (diff) | |
| parent | 080f9d0b99b0d2e7e179a41d901096e595000448 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I13dfef5918cada019dfa29a28a8eee6a6efa7e27
Diffstat (limited to 'src/render/texture/texture_p.h')
| -rw-r--r-- | src/render/texture/texture_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h index 705d86e68..c60e90181 100644 --- a/src/render/texture/texture_p.h +++ b/src/render/texture/texture_p.h @@ -84,7 +84,7 @@ struct TextureProperties int mipLevels = 1; int samples = 1; QAbstractTexture::Target target = QAbstractTexture::Target2D; - QAbstractTexture::TextureFormat format = QAbstractTexture::RGBA8_UNorm; + QAbstractTexture::TextureFormat format = QAbstractTexture::NoFormat; bool generateMipMaps = false; QAbstractTexture::Status status = QAbstractTexture::None; |