diff options
| author | Michael Brasser <michael.brasser@live.com> | 2014-02-11 08:52:06 -0600 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-15 14:57:51 +0100 |
| commit | e03d027b7fd28ee367139617c8c4b22630f77932 (patch) | |
| tree | e569abf0d732d712ae5a754a97ad61d65cc96453 /src/quick/scenegraph/coreapi | |
| parent | 1ec525e7e011a8881ec7d90e34876d5bf5fb2fc8 (diff) | |
Update scenegraph docs to be in line with Qt 5.2 behavior changes.
Change-Id: Id21386e6dc85bb7e109d9bd03e80f306c0a99733
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/scenegraph/coreapi')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.cpp | 6 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.cpp | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.cpp b/src/quick/scenegraph/coreapi/qsgmaterial.cpp index 686d1438b4..4954fe20bb 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterial.cpp @@ -257,9 +257,6 @@ const char *QSGMaterialShader::fragmentShader() const State that is global for all uses of the shader, independent of the geometry that is being drawn, can be setup in this function. - - If reimplemented, make sure to either call the base class implementation to - enable the vertex attribute registers. */ void QSGMaterialShader::activate() @@ -271,9 +268,6 @@ void QSGMaterialShader::activate() /*! This function is called by the scene graph to indicate that geometry will no longer to be rendered using this shader. - - If reimplemented, make sure to either call the base class implementation to - disable the vertex attribute registers. */ void QSGMaterialShader::deactivate() diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp index b0c869c096..5c196b252c 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.cpp +++ b/src/quick/scenegraph/coreapi/qsgnode.cpp @@ -648,10 +648,7 @@ void QSGNode::setFlags(Flags f, bool enabled) /*! - Marks this node with the states in \a bits as dirty. - - When a node is marked dirty, it recursively marks the parent chain - as dirty and notify all connected renderers that the has dirty states. + Notifies all connected renderers that the node has dirty \a bits. */ void QSGNode::markDirty(DirtyState bits) |