diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-17 12:49:13 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-17 17:42:07 +0200 |
commit | 90ed1ba80a610713bd0eca8377a3f0f40293cf29 (patch) | |
tree | 89b67da2594a41a4edd4a94d0c98a2d61d13231e /src/quick/scenegraph/coreapi/qsgmaterialshader.cpp | |
parent | 0fbb073c032782b0e7da5c9d645c22d1a1407849 (diff) |
Hide QSGTexture APIs with non-public types from the public docs
Our aim is to provide a clean and lean QSGTexture interface and this
involves having certain QRhi types in some of the functions. Putting
these functions into some private class leads to unnecessary ugliness
all over the place, and would infect other modules, such as Quick 3D as
well. At the same time, fully documenting functions like rhiTexture() is
probably weird in 6.0 since QRhiTexture is not a public class and is
forward declared at best.
So until the QRhi API story crystalizes long term, mark these functions as
internal.
Change-Id: I8248fc5ba40f0ca94b3542b13d12f24cc9bd76f6
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgmaterialshader.cpp')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterialshader.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp b/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp index 89fb63eb42..2465d7a674 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp +++ b/src/quick/scenegraph/coreapi/qsgmaterialshader.cpp @@ -455,9 +455,7 @@ bool QSGMaterialShader::updateUniformData(RenderState &state, The current rendering \a state is passed from the scene graph. Where relevant, it is up to the material to trigger enqueuing texture data - uploads. This is typically done by calling the virtual - QSGTexture::commitTextureOperations() with \c{state.rhi()} and - \c{state.resourceUpdateBatch()}. + uploads. The subclass specific state can be extracted from \a newMaterial. |