diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-01-27 10:08:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 09:24:40 +0100 |
| commit | 15999f14f146b5c04fb40b31b69ceeeece273430 (patch) | |
| tree | c4694e18da30dc10075ca10e254bca02c3061383 /src/quick/scenegraph/util/qsgtexture_p.h | |
| parent | 4cf4d18b98f5ceaafc3f595c5eadad9ceb337813 (diff) | |
Add Image::mipmap to support mipmapping of images.
[ChangeLog][QtQuick] New feature: Image.mipmap
Task-number: QTBUG-19961
Change-Id: I13acb2408d5b126790adaf9d324ad4beda1e3646
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgtexture_p.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexture_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgtexture_p.h b/src/quick/scenegraph/util/qsgtexture_p.h index e0d386e20c..bc81569f84 100644 --- a/src/quick/scenegraph/util/qsgtexture_p.h +++ b/src/quick/scenegraph/util/qsgtexture_p.h @@ -85,8 +85,7 @@ public: void setHasAlphaChannel(bool alpha) { m_has_alpha = alpha; } bool hasAlphaChannel() const { return m_has_alpha; } - void setHasMipmaps(bool mm); - bool hasMipmaps() const { return m_has_mipmaps; } + bool hasMipmaps() const { return mipmapFiltering() != QSGTexture::None; } void setImage(const QImage &image); const QImage &image() { return m_image; } @@ -107,7 +106,6 @@ protected: QRectF m_texture_rect; uint m_has_alpha : 1; - uint m_has_mipmaps : 1; uint m_dirty_texture : 1; uint m_dirty_bind_options : 1; uint m_owns_texture : 1; |