diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-05-18 08:31:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 14:49:10 +0200 |
| commit | b528809fc46ae80b291b62a9da45ea3147977dd2 (patch) | |
| tree | 1368db06f3e994318a5860ddd3ce8c8f6ffb2d1a /src/quick | |
| parent | 81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db (diff) | |
Avoid redundant QColor::alphaF() calls.
Change-Id: I3694b075e98eab9f3eacf7758881a9473999b46e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/scenegraph/util/qsgflatcolormaterial.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp index 307201277c..09e2a7da27 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp @@ -74,11 +74,11 @@ void FlatColorMaterialShader::updateState(const RenderState &state, QSGMaterial const QColor &c = newMaterial->color(); if (oldMaterial == 0 || c != oldMaterial->color() || state.isOpacityDirty()) { - float opacity = state.opacity(); - QVector4D v(c.redF() * c.alphaF() * opacity, - c.greenF() * c.alphaF() * opacity, - c.blueF() * c.alphaF() * opacity, - c.alphaF() * opacity); + float opacity = state.opacity() * c.alphaF(); + QVector4D v(c.redF() * opacity, + c.greenF() * opacity, + c.blueF() * opacity, + opacity); program()->setUniformValue(m_color_id, v); } |