diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
| commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
| tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualization/utils/shaderhelper_p.h | |
| parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
| parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) | |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualization/utils/shaderhelper_p.h')
| -rw-r--r-- | src/datavisualization/utils/shaderhelper_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index 191b7bf6..34bbf39e 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -34,7 +34,7 @@ class QOpenGLShaderProgram; -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper { @@ -73,6 +73,7 @@ class ShaderHelper GLuint shadow(); GLuint gradientMin(); GLuint gradientHeight(); + GLuint lightColor(); GLuint posAtt(); GLuint uvAtt(); @@ -106,10 +107,11 @@ class ShaderHelper GLuint m_shadowUniform; GLuint m_gradientMinUniform; GLuint m_gradientHeightUniform; + GLuint m_lightColorUniform; GLboolean m_initialized; }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION #endif |