Optimize QHash usage in RenderView::setShaderAndUniforms.

Do not allocate a temporary list of keys to iterate over. Use
iterators directly.

Change-Id: Ic422b2b6ec8ba80e94ff95a7fa1edb4ec3f6e666
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index ea67d7c4d..fdc650a73 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -717,10 +717,17 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass *
                 }
 
                 // If there are remaining parameters, those are set as uniforms
-                Q_FOREACH (const QString &paramName, parameters.keys()) {
-                    if (uniformNames.contains(paramName))
-                        setUniformValue(command->m_uniforms, paramName, parameters.take(paramName));
-                    // Else param unused by current shader
+                if (!uniformNames.isEmpty() && !parameters.isEmpty()) {
+                    QHash<QString, QVariant>::iterator it = parameters.begin();
+                    while (it != parameters.end()) {
+                        if (uniformNames.contains(it.key())) {
+                            setUniformValue(command->m_uniforms, it.key(), it.value());
+                            it = parameters.erase(it);
+                        } else {
+                            // Else param unused by current shader
+                            ++it;
+                        }
+                    }
                 }
 
                 // Sets lights in shader