diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2018-07-20 09:17:18 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2018-08-08 13:41:13 +0000 |
commit | 85f8e910fa484296afd19a4568ba939502d562f7 (patch) | |
tree | 253c300a1266c5cd1b5997c90796bbb1af0f9369 /src/render/renderers/opengl/graphicshelpers | |
parent | 0b10ab797fea863ff2c4897b1c4eb993b21b153d (diff) |
Properly update properties from Backend to Frontend textures
Taking into account we have texture sharing in the backend,
we can only update frontend texture properties once we have
created the shared backend texture.
Code was adjusted to retrieve these properties when creating
the GLTexture. Such changes are stored and sent on the next
run loop from a job where they are distributed to all referenced
frontend Texture.
The status property handling has also been updated to send status
changes to all shared textures instead of just the texture whose
data generator is used to gather the data.
A manual test checking texture property updates, sharing and
remote url sharing has also been added.
Change-Id: I8ed2449fe57c9d7337580b0f7561f974cbd5006d
Task-number: QTBUG-65775
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/renderers/opengl/graphicshelpers')
-rw-r--r-- | src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index cdc895f4d..6e1cd5d47 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -863,7 +863,7 @@ void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId, const Atta for (const Attachment &attachment : attachments_) { GLTexture *rTex = glTextureManager->lookupResource(attachment.m_textureUuid); if (!m_glHelper->frameBufferNeedsRenderBuffer(attachment)) { - QOpenGLTexture *glTex = rTex ? rTex->getOrCreateGLTexture() : nullptr; + QOpenGLTexture *glTex = rTex ? rTex->getGLTexture() : nullptr; if (glTex != nullptr) { // The texture can not be rendered simultaniously by another renderer Q_ASSERT(!rTex->isExternalRenderingEnabled()); |