diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-11 12:56:51 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-11 13:16:01 +0200 |
| commit | 7ab1f9834ff38fffae8e87b87684b00b0509a21a (patch) | |
| tree | 1872bf53f43b666ee3601c44841ece6922e2c5b9 /src/declarative/scenegraph/util/qsgflatcolormaterial.cpp | |
| parent | 53c6fb735adce3962d08fe67d58d911efa2eb331 (diff) | |
Documentation and API cleanup of QSGMaterial
Diffstat (limited to 'src/declarative/scenegraph/util/qsgflatcolormaterial.cpp')
| -rw-r--r-- | src/declarative/scenegraph/util/qsgflatcolormaterial.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp b/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp index ed3d96fee5..74ff8acbe0 100644 --- a/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp +++ b/src/declarative/scenegraph/util/qsgflatcolormaterial.cpp @@ -79,11 +79,11 @@ void FlatColorMaterialShader::updateState(const RenderState &state, QSGMaterial c.greenF() * c.alphaF() * opacity, c.blueF() * c.alphaF() * opacity, c.alphaF() * opacity); - m_program.setUniformValue(m_color_id, v); + program()->setUniformValue(m_color_id, v); } if (state.isMatrixDirty()) - m_program.setUniformValue(m_matrix_id, state.combinedMatrix()); + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } char const *const *FlatColorMaterialShader::attributeNames() const @@ -94,8 +94,8 @@ char const *const *FlatColorMaterialShader::attributeNames() const void FlatColorMaterialShader::initialize() { - m_matrix_id = m_program.uniformLocation("matrix"); - m_color_id = m_program.uniformLocation("color"); + m_matrix_id = program()->uniformLocation("matrix"); + m_color_id = program()->uniformLocation("color"); } const char *FlatColorMaterialShader::vertexShader() const { |