diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-08-14 07:27:07 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 14:24:36 +0200 |
commit | b480fa83a632b2ae5606e2870b47358328b479a2 (patch) | |
tree | bdd3e1b68a5a15a3950e13a50db911a93cdf279a /src/quick/scenegraph/coreapi/qsgmaterial.h | |
parent | 9be35c270082d1614886874e17cc3f90a7a3f489 (diff) |
New scenegraph renderer and atlas textures.
The renderer tries to batch primitives together where possible, isolate
non-changing subparts of the scene from changing subparts and retain
vertexdata on the GPU as much as possible. Atlas textures are crucial
in enabling batching.
The renderer and atlas texture are described in detail in the doc page
"Qt Quick Scene Graph Renderer".
Change-Id: Ia476c7f0f42e1fc57a2cef528e93ee88cf8f7055
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgmaterial.h')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 00970a5801..3483ae59c8 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -49,6 +49,10 @@ QT_BEGIN_NAMESPACE class QSGMaterial; +namespace QSGBatchRenderer { + class ShaderManager; +} + class Q_QUICK_EXPORT QSGMaterialShader { public: @@ -95,8 +99,8 @@ public: inline QOpenGLShaderProgram *program() { return &m_program; } protected: - friend class QSGContext; + friend class QSGBatchRenderer::ShaderManager; virtual void compile(); virtual void initialize() { } |