diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-06-20 09:31:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-20 21:31:47 +0200 |
| commit | e357f015391ac32e8d262b4ea2bd0e3fe1e87fe6 (patch) | |
| tree | 0870b87fae54491f2b11ab6aece7fa19c52e0e6c /src/quick/scenegraph/coreapi/qsgmaterial.h | |
| parent | 5d4b006181d009e6245d5d38c7798603ddcab06a (diff) | |
Revert "Cut performance cost in QSGContext::prepareMaterial()".
This reverts commit 0e9cd8b4098661bf611fa73a787c58c85e7d7338.
This optimization breaks ShaderEffects with changing fragment
and vertex shaders and needs some more thought.
Task-number: QTBUG-31837
Change-Id: I1abe249c65dd785825c249a7c22baee928bd76c8
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgmaterial.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 20ab21ad28..ee8889deac 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -133,7 +133,6 @@ public: void setFlag(Flags flags, bool on = true); private: - friend class QSGContext; Flags m_flags; void *m_reserved; Q_DISABLE_COPY(QSGMaterial) |