diff options
author | Volker Krause <volker.krause@kdab.com> | 2016-01-08 11:04:00 +0100 |
---|---|---|
committer | Volker Krause <volker.krause@kdab.com> | 2016-01-19 13:16:06 +0000 |
commit | 4d70b9af0049562cfb8cc12ebb68f3281fc96c69 (patch) | |
tree | d8e233727d4e805612618e5037b1b08022faa510 /src/render/materialsystem/shaderdata.cpp | |
parent | 4aeadb92130ce650bf5f137071d7777783eaa0e8 (diff) |
Don't allocate QMutex members on the heap.
Change-Id: I23f1ccd2f2bbee2fcab2eadfeeec83e1ac489623
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/shaderdata.cpp')
-rw-r--r-- | src/render/materialsystem/shaderdata.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 9e07c5810..22548498b 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -56,14 +56,12 @@ namespace Render { QList<Qt3DCore::QNodeId> ShaderData::m_updatedShaderData; ShaderData::ShaderData() - : m_mutex(new QMutex) - , m_managers(Q_NULLPTR) + : m_managers(Q_NULLPTR) { } ShaderData::~ShaderData() { - delete m_mutex; } void ShaderData::setManagers(NodeManagers *managers) @@ -141,7 +139,7 @@ bool ShaderData::updateViewTransform(const QMatrix4x4 &viewMatrix) { // We can't perform this only once as we don't know if we would be call as the root or a // nested ShaderData - QMutexLocker lock(m_mutex); + QMutexLocker lock(&m_mutex); // Update transformed properties // We check the matrices and decide if the transform has changed since the previous call to needsUpdate @@ -216,7 +214,7 @@ bool ShaderData::updateWorldTransform(const QMatrix4x4 &worldMatrix) // Called by renderview jobs (several concurrent threads) void ShaderData::markDirty() { - QMutexLocker lock(m_mutex); + QMutexLocker lock(&m_mutex); if (!ShaderData::m_updatedShaderData.contains(peerUuid())) ShaderData::m_updatedShaderData.append(peerUuid()); } |