Avoid unnecessary color format conversion

If a color is not the rgb format, when QColor::red() QColor::blue()
QColor::green() is used continuously to obtain the values of different
channels, three times color conversions will occur. Therefore, use
QColor::toRgb() before that to ensure that only one conversion is
performed at most. Not only rgb, the conversion of other formats is the
same.

Change-Id: Ia969e1ca6f1524ad5d7e8dec915bcbc407875c66
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 4 insertions, 8 deletions

diff --git a/examples/quick/scenegraph/graph/linenode.cpp b/examples/quick/scenegraph/graph/linenode.cpp
index 74161c8040..c567218f74 100644
--- a/examples/quick/scenegraph/graph/linenode.cpp
+++ b/examples/quick/scenegraph/graph/linenode.cpp
@@ -123,10 +123,8 @@ bool LineShader::updateUniformData(RenderState &state, QSGMaterial *newMaterial,
     }
 
     LineMaterial *mat = static_cast<LineMaterial *>(newMaterial);
-    float c[4] = { float(mat->state.color.redF()),
-                   float(mat->state.color.greenF()),
-                   float(mat->state.color.blueF()),
-                   float(mat->state.color.alphaF()) };
+    float c[4];
+    mat->state.color.getRgbF(&c[0], &c[1], &c[2], &c[3]);
     memcpy(buf->data() + 64, c, 16);
     memcpy(buf->data() + 84, &mat->state.size, 4);
     memcpy(buf->data() + 88, &mat->state.spread, 4);
diff --git a/examples/quick/scenegraph/graph/noisynode.cpp b/examples/quick/scenegraph/graph/noisynode.cpp
index f8b72bfe67..474d75058c 100644
--- a/examples/quick/scenegraph/graph/noisynode.cpp
+++ b/examples/quick/scenegraph/graph/noisynode.cpp
@@ -131,10 +131,8 @@ bool NoisyShader::updateUniformData(RenderState &state, QSGMaterial *newMaterial
     }
 
     NoisyMaterial *mat = static_cast<NoisyMaterial *>(newMaterial);
-    float c[4] = { float(mat->state.color.redF()),
-                   float(mat->state.color.greenF()),
-                   float(mat->state.color.blueF()),
-                   float(mat->state.color.alphaF()) };
+    float c[4];
+    mat->state.color.getRgbF(&c[0], &c[1], &c[2], &c[3]);
     memcpy(buf->data() + 64, c, 16);
 
     const QSize s = mat->state.texture->textureSize();