diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-02-18 19:54:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-21 06:39:34 +0100 |
| commit | c6c95915f076577d5194044d793889cb8b690230 (patch) | |
| tree | 2d4d3d7968358c209f356ddcbb930f3d2f5e135f /src/quick/scenegraph/util/qsgatlastexture_p.h | |
| parent | f158fa7feaa5d9fc2ae17aa16853acbbb947443a (diff) | |
Make sure we update filtering options on atlas textures.
We had had an optimization which tried to reduce state changes,
but filtering is also changed in QSGTexture::updateBindOptions
which Atlas::bind() didn't know anything about. Solution: don't
try to be so clever.
Task-number: QTBUG-35457
Change-Id: I39ac0106396921e1b652db2b2aa5a9923b35e825
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgatlastexture_p.h')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture_p.h b/src/quick/scenegraph/util/qsgatlastexture_p.h index ade7b8f00e..51439cdb26 100644 --- a/src/quick/scenegraph/util/qsgatlastexture_p.h +++ b/src/quick/scenegraph/util/qsgatlastexture_p.h @@ -85,7 +85,7 @@ public: void invalidate(); int textureId() const; - bool bind(QSGTexture::Filtering filteing); + void bind(QSGTexture::Filtering filtering); void upload(Texture *texture); void uploadBgra(Texture *texture); @@ -104,8 +104,6 @@ private: GLuint m_internalFormat; GLuint m_externalFormat; - QSGTexture::Filtering m_filtering; - uint m_allocated : 1; uint m_use_bgra_fallback: 1; |