diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-10-17 14:53:33 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-30 08:29:49 +0100 |
commit | 906d5c5c40183468f9521277c6244a6c46730de6 (patch) | |
tree | 0eb46a8f88d59993ab659e2dc07970d1ce2f0d73 /src/quick/scenegraph/util/qsgatlastexture_p.h | |
parent | c084d32d92b2df55532fa1599e590c29bf2b5bfb (diff) |
Use one render loop per QQuickWindow
See the task for the full reasoning behind this patch.
The threaded renderloop has been refactored to have one window per
thread. This is mostly a simplification of the current code path where
for loops over multiple windows are turned into if (window).
The QSGContext has been split into two classes, QSGRenderContext
for which there is one per OpenGLContext.
The rest of the patch is name changes and a couple of cleanups
in the hopes of simplifying this change.
Task-number: QTBUG-33993
Change-Id: I31c81f9694d7da7474a72333169be38de62613c4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgatlastexture_p.h')
-rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture_p.h b/src/quick/scenegraph/util/qsgatlastexture_p.h index f8edd96f47..ade7b8f00e 100644 --- a/src/quick/scenegraph/util/qsgatlastexture_p.h +++ b/src/quick/scenegraph/util/qsgatlastexture_p.h @@ -50,6 +50,8 @@ #include <QtQuick/private/qsgtexture_p.h> #include <QtQuick/private/qsgareaallocator_p.h> +QT_BEGIN_NAMESPACE + namespace QSGAtlasTexture { @@ -69,19 +71,18 @@ public: private: Atlas *m_atlas; - Atlas *m_secondary_atlas; QSize m_atlas_size; int m_atlas_size_limit; }; -class Atlas +class Atlas : public QObject { public: Atlas(const QSize &size); ~Atlas(); - void initialize(); + void invalidate(); int textureId() const; bool bind(QSGTexture::Filtering filteing); @@ -95,7 +96,6 @@ public: QSize size() const { return m_size; } private: - QSGAreaAllocator m_allocator; GLuint m_texture_id; QSize m_size; @@ -153,4 +153,6 @@ private: } +QT_END_NAMESPACE + #endif |