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/qsgvertexcolormaterial.cpp | |
parent | 53c6fb735adce3962d08fe67d58d911efa2eb331 (diff) |
Documentation and API cleanup of QSGMaterial
Diffstat (limited to 'src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp')
-rw-r--r-- | src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp b/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp index dee64ba9dd..033de1f73e 100644 --- a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp +++ b/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp @@ -67,10 +67,10 @@ QSGMaterialType QSGVertexColorMaterialShader::type; void QSGVertexColorMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) { if (!(newEffect->flags() & QSGMaterial::Blending) || state.isOpacityDirty()) - m_program.setUniformValue(m_opacity_id, state.opacity()); + program()->setUniformValue(m_opacity_id, state.opacity()); if (state.isMatrixDirty()) - m_program.setUniformValue(m_matrix_id, state.combinedMatrix()); + program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } char const *const *QSGVertexColorMaterialShader::attributeNames() const @@ -81,8 +81,8 @@ char const *const *QSGVertexColorMaterialShader::attributeNames() const void QSGVertexColorMaterialShader::initialize() { - m_matrix_id = m_program.uniformLocation("matrix"); - m_opacity_id = m_program.uniformLocation("opacity"); + m_matrix_id = program()->uniformLocation("matrix"); + m_opacity_id = program()->uniformLocation("opacity"); } const char *QSGVertexColorMaterialShader::vertexShader() const { |