aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-02-08 08:09:11 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-09 10:57:21 +0100
commit6c041f2122920307a2506067fdf64f65c614fbf7 (patch)
tree5e257977d83850c622598faeca203960a5c01b4d /src/imports
parent8550ed69156f0472450fd11aabcaa5d4dcc676db (diff)
Pass the QQuickCanvas to texture factories.
This makes it a lot more convenient as we then have direct access to the GL context, createTexture(), invalidation signal and more. Change-Id: I114514d1379c4d0efcc35c512fa2b485da3438b0 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/etcprovider/qetcprovider.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/etcprovider/qetcprovider.cpp b/src/imports/etcprovider/qetcprovider.cpp
index e80ab714c0..15ece33312 100644
--- a/src/imports/etcprovider/qetcprovider.cpp
+++ b/src/imports/etcprovider/qetcprovider.cpp
@@ -159,7 +159,7 @@ public:
return m_data.size();
}
- QSGTexture *createTexture() const {
+ QSGTexture *createTexture(QQuickCanvas *) const {
EtcTexture *texture = new EtcTexture;
texture->m_data = m_data;
texture->m_size = m_size;