diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-11-30 10:09:59 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-01 14:24:23 +0000 |
| commit | 2484939ec1f82464b4675746940a3a45d1934cae (patch) | |
| tree | 4d75df7b8de4be2b319c5f3ffc0b57f6b6f252d5 /src | |
| parent | ce8633cad20de91361f800cd4f5b6d81ccbe64cc (diff) | |
RHI: restore QBufferCapture feature
Also fix manual test to import Qt3D.Core 2.9 since QBuffer was moved to
core in Qt 6 and accessType property was introduce with revision 9.
Change-Id: I449f413fd161fe4660cef61708cd641e429c1c81
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 10adc1c93c80dba4535a3cf22c5095d788ae0a43)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/renderers/rhi/renderer/renderer.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/renderers/rhi/renderer/renderer_p.h | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp index 953412b72..c6190403b 100644 --- a/src/plugins/renderers/rhi/renderer/renderer.cpp +++ b/src/plugins/renderers/rhi/renderer/renderer.cpp @@ -2028,7 +2028,7 @@ void Renderer::cleanupRenderTarget(const Qt3DCore::QNodeId &renderTargetId) } // Called by SubmitRenderView -void Renderer::downloadGLBuffers() +void Renderer::downloadRHIBuffers() { const std::vector<Qt3DCore::QNodeId> downloadableHandles = std::move(m_downloadableBuffers); for (const Qt3DCore::QNodeId &bufferId : downloadableHandles) { @@ -2128,12 +2128,6 @@ Renderer::submitRenderViews(const std::vector<RHIPassInfo> &rhiPassesInfo) m_lastFrameCorrect.storeRelaxed( 0); // something went wrong; make sure to render the next frame! - // if (renderView->isDownloadBuffersEnable()) - // { - // RHI_UNIMPLEMENTED; - ////* downloadGLBuffers(); - // } - frameElapsed = timer.elapsed() - frameElapsed; qCDebug(Rendering) << Q_FUNC_INFO << "Submitted RHI Passes " << i + 1 << "/" << rhiPassesCount << "in " << frameElapsed << "ms"; @@ -2801,6 +2795,9 @@ bool Renderer::executeCommandsSubmission(const RHIPassInfo &passInfo) } } } + + if (rv->isDownloadBuffersEnable()) + downloadRHIBuffers(); } if (Q_LIKELY(inDraw)) diff --git a/src/plugins/renderers/rhi/renderer/renderer_p.h b/src/plugins/renderers/rhi/renderer/renderer_p.h index 7992aff2b..e30aa9d90 100644 --- a/src/plugins/renderers/rhi/renderer/renderer_p.h +++ b/src/plugins/renderers/rhi/renderer/renderer_p.h @@ -252,7 +252,7 @@ public: void updateTexture(Texture *texture); void cleanupTexture(Qt3DCore::QNodeId cleanedUpTextureId); void cleanupShader(const Shader *shader); - void downloadGLBuffers(); + void downloadRHIBuffers(); struct RHIPassInfo { |