summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-08-01 12:47:10 +0200
committerUlf Hermann <ulf.hermann@qt.io>2016-08-05 13:49:48 +0000
commit80933144bd12c6cda139ca9db79b4d2734a14f61 (patch)
tree57259fe72bdd0f8de8faa713c14ab8db9e204d72 /src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
parentd318b18c834900ce845dc67b147634aaee17d0b2 (diff)
downloadqt-creator-80933144bd12c6cda139ca9db79b4d2734a14f61.tar.gz
QmlProfiler: Paint binding loop markers in timeline highlight color
Change-Id: I7cf12f87a4d78a2dcfc0a6e9fe7dc460a6ade70f Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
index ed43b4b480..6647aa5771 100644
--- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
@@ -26,6 +26,8 @@
#include "qmlprofilerbindingloopsrenderpass.h"
#include <utils/qtcassert.h>
+#include <utils/theme/theme.h>
+
namespace QmlProfiler {
namespace Internal {
@@ -302,6 +304,7 @@ private:
int m_matrix_id;
int m_z_range_id;
+ int m_color_id;
};
BindingLoopMaterialShader::BindingLoopMaterialShader()
@@ -316,6 +319,9 @@ void BindingLoopMaterialShader::updateState(const RenderState &state, QSGMateria
if (state.isMatrixDirty()) {
program()->setUniformValue(m_matrix_id, state.combinedMatrix());
program()->setUniformValue(m_z_range_id, GLfloat(1.0));
+ program()->setUniformValue(
+ m_color_id,
+ Utils::creatorTheme()->color(Utils::Theme::Timeline_HighlightColor));
}
}
@@ -329,6 +335,7 @@ void BindingLoopMaterialShader::initialize()
{
m_matrix_id = program()->uniformLocation("matrix");
m_z_range_id = program()->uniformLocation("_qt_zRange");
+ m_color_id = program()->uniformLocation("bindingLoopsColor");
}