diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-07 15:38:51 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-16 09:59:15 +0200 |
commit | 3768ec496cb8be1b8bedafd08c19732a405dfeea (patch) | |
tree | c35780a359ebf600e489c8d4369929d00b308644 /src/quick/scenegraph/qsgrhishadereffectnode.cpp | |
parent | bc1b6e73bb31c7eb9b9f6b4920d2e99ac441bc08 (diff) |
Add argument to QSGTexture::removedFromAtlas()
...as requested by the Qt 6 TODO. To preserve binary (and source)
compatibility in 5.14, the argument was changed into a variable in
QSGTexturePrivate, with a public setter. This can now go away and the
signature of removedFromAtlas() can get updated.
Task-number: QTBUG-82997
Change-Id: I930c0014712c78e140b778b6e9a4d8b92c5bdc8c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgrhishadereffectnode.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgrhishadereffectnode.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgrhishadereffectnode.cpp b/src/quick/scenegraph/qsgrhishadereffectnode.cpp index e86dae7c09..e804dc96b7 100644 --- a/src/quick/scenegraph/qsgrhishadereffectnode.cpp +++ b/src/quick/scenegraph/qsgrhishadereffectnode.cpp @@ -402,9 +402,7 @@ void QSGRhiShaderEffectMaterialShader::updateSampledImage(RenderState &state, in // committed operations to state.resourceUpdateBatch()... The // only safe way then is to use the same batch the atlas' // updateRhiTexture() used. - t->setWorkResourceUpdateBatch(state.resourceUpdateBatch()); - QSGTexture *newTexture = t->removedFromAtlas(); - t->setWorkResourceUpdateBatch(nullptr); + QSGTexture *newTexture = t->removedFromAtlas(state.resourceUpdateBatch()); if (newTexture) t = newTexture; } |