diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-12-07 22:44:32 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-12-07 22:44:32 +0100 |
commit | f5c4c7dff4b44dc80c117138229c0218bc22fbc3 (patch) | |
tree | bc002024efac4079bbf7decd3e13bab526e18efc /src/scenegraph/convenience/texturematerial.h | |
parent | f3073afd4a44a659152a7983d55887090792b4a9 (diff) |
Start yet another rewrite of the texture handling...
Diffstat (limited to 'src/scenegraph/convenience/texturematerial.h')
-rw-r--r-- | src/scenegraph/convenience/texturematerial.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scenegraph/convenience/texturematerial.h b/src/scenegraph/convenience/texturematerial.h index 5cce7ed..166bca1 100644 --- a/src/scenegraph/convenience/texturematerial.h +++ b/src/scenegraph/convenience/texturematerial.h @@ -55,8 +55,8 @@ public: virtual int compare(const AbstractEffect *other) const; // ### gunnar: opaque -> alpha, as "hasAlphaChannel()" is what we normally use - void setTexture(const TextureReference *texture, bool opaque = false); - const TextureReference *texture() const { return m_texture; } + void setTexture(const QSGTextureRef &texture, bool opaque = false); + const QSGTextureRef &texture() const { return m_texture; } void setLinearFiltering(bool linearFiltering) { m_linear_filtering = linearFiltering; } bool linearFiltering() const { return m_linear_filtering; } @@ -64,7 +64,7 @@ public: static bool is(const AbstractEffect *effect); protected: - const TextureReference *m_texture; + QSGTextureRef m_texture; bool m_opaque; bool m_linear_filtering; }; @@ -96,7 +96,7 @@ public: virtual AbstractEffectType *type() const; virtual AbstractEffectProgram *createProgram() const; virtual int compare(const AbstractEffect *other) const; - void setTexture(const TextureReference *texture, bool opaque = false); + void setTexture(const QSGTextureRef &texture, bool opaque = false); void setOpacity(qreal opacity); qreal opacity() const { return m_opacity; } |