diff options
author | Volker Krause <volker.krause@kdab.com> | 2016-01-06 16:08:33 +0100 |
---|---|---|
committer | Volker Krause <volker.krause@kdab.com> | 2016-01-07 19:25:49 +0000 |
commit | c765515134e1f7608753806e46e79295135fe1a3 (patch) | |
tree | 50767fcd518dfdeb265984ffd7394ba59a1929a0 /src | |
parent | b4b4a800aa059eaf8b4f5573043a5798be5b372a (diff) |
Avoid unnecessary detaching.
Change-Id: Ied910d38c400b34a38f6eaea9683107b079513ec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/render/backend/renderview.cpp | 6 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 905eaa281..ac7c9cf78 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -362,7 +362,7 @@ void RenderView::sort() // where two uniforms, referencing the same texture eventually have 2 different // texture unit values if (cachedUniforms.contains(it.key())) { - const QUniformValue *refValue = cachedUniforms[it.key()]; + const QUniformValue *refValue = cachedUniforms.value(it.key()); if (*const_cast<QUniformValue *>(refValue) == *it.value()) { destroyUniformValue(it.value(), m_allocator); it = uniforms.erase(it); @@ -624,8 +624,8 @@ void RenderView::setDefaultUniformBlockShaderDataValue(QUniformPack &uniformPack // Build name-value map for the block m_data->m_uniformBlockBuilder.buildActiveUniformNameValueMapStructHelper(shaderData, structName); // Set uniform values for each entrie of the block name-value map - QHash<QString, QVariant>::const_iterator activeValuesIt = m_data->m_uniformBlockBuilder.activeUniformNamesToValue.begin(); - const QHash<QString, QVariant>::const_iterator activeValuesEnd = m_data->m_uniformBlockBuilder.activeUniformNamesToValue.end(); + QHash<QString, QVariant>::const_iterator activeValuesIt = m_data->m_uniformBlockBuilder.activeUniformNamesToValue.constBegin(); + const QHash<QString, QVariant>::const_iterator activeValuesEnd = m_data->m_uniformBlockBuilder.activeUniformNamesToValue.constEnd(); while (activeValuesIt != activeValuesEnd) { setUniformValue(uniformPack, activeValuesIt.key(), activeValuesIt.value()); diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index a35513d9a..d77b04640 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -368,7 +368,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) } // Only add dependency if not already present - QVector<QWeakPointer<QAspectJob> > dependencies = pickBoundingVolumeJob->dependencies(); + const QVector<QWeakPointer<QAspectJob> > dependencies = pickBoundingVolumeJob->dependencies(); if (std::find(dependencies.begin(), dependencies.end(), d->m_updateBoundingVolumeJob) == dependencies.end()) pickBoundingVolumeJob->addDependency(d->m_updateBoundingVolumeJob); |