diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-08-02 15:18:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 17:03:15 +0200 |
| commit | 3ed9f1f4b6f9e17943fe8f756e1ff9d6ba2b6479 (patch) | |
| tree | d9998b8110eecee82e1c6de3b585d72760f13bff /src/quick/items/qquickwindow.h | |
| parent | 0bf62bd47bfda33305153a808619550e6a5b896f (diff) | |
Public API for creating atlas textures, when available.
Atlas textures are currently only used when scenegraph is
combined with the customcontext from the playground/scenegraph
module.
Change-Id: I42f62abdad42e97cc1dcdc05bfb16ecf2839dc0e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index a0bc832334..fad67e9734 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -72,7 +72,8 @@ public: enum CreateTextureOption { TextureHasAlphaChannel = 0x0001, TextureHasMipmaps = 0x0002, - TextureOwnsGLTexture = 0x0004 + TextureOwnsGLTexture = 0x0004, + TextureCanUseAtlas = 0x0008 }; Q_DECLARE_FLAGS(CreateTextureOptions, CreateTextureOption) @@ -107,6 +108,7 @@ public: // Scene graph specific functions QSGTexture *createTextureFromImage(const QImage &image) const; + QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options) const; QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption(0)) const; void setClearBeforeRendering(bool enabled); |