diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-24 22:37:33 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-24 22:37:33 +0200 |
| commit | ed86fb2dbd4d4887e4c7b2d37f7842ac64a5e860 (patch) | |
| tree | 0703b80939874a7bb9e7a4028a07d998d866010d /src/quick/scenegraph | |
| parent | 2d065ddb53a31c1b717c88902bcdf4f6b24f320f (diff) | |
| parent | 7320f61e8782119a3f95d85f67fb9c7a973d043a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 9 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 9346236db9..c0794d0d69 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -556,7 +556,6 @@ static void qt_print_material_count() QSGMaterial::QSGMaterial() : m_flags(0) - , m_reserved(0) { #ifndef QT_NO_DEBUG if (qsg_leak_check) { 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) diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 866d678412..a142a23c67 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -507,16 +507,10 @@ QSGDepthStencilBufferManager *QSGContext::depthStencilBufferManager() QSGMaterialShader *QSGContext::prepareMaterial(QSGMaterial *material) { Q_D(QSGContext); - - if (material->m_reserved) - return reinterpret_cast<QSGMaterialShader *>(material->m_reserved); - QSGMaterialType *type = material->type(); QSGMaterialShader *shader = d->materials.value(type); - if (shader) { - material->m_reserved = shader; + if (shader) return shader; - } #ifndef QSG_NO_RENDER_TIMING if (qsg_render_timing || QQmlProfilerService::enabled) @@ -524,7 +518,6 @@ QSGMaterialShader *QSGContext::prepareMaterial(QSGMaterial *material) #endif shader = material->createShader(); - material->m_reserved = shader; shader->compile(); shader->initialize(); d->materials[type] = shader; |