summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Atsushi <atsushi.yamamoto@signal-slot.co.jp>2022-06-23 20:22:55 +0900
committerYAMAMOTO Atsushi - Signal Slot <atsushi.yamamoto@signal-slot.co.jp>2022-06-24 11:13:15 +0000
commite70cdcc26d51410c6b2968160c549e55f12a5a5d (patch)
tree30cf48526fbdc18bc3eb25c4ba5cff2ca9a5ad22
parent489df1a7e1f1fb692b5ea745fa3c10d5f7296006 (diff)
RHI: fix Rhi::Renderer that creating bad QImage instance
Rhi::Renderer frees the memory referenced by QImage immediately after generating QImage. This memory should not be freed during using QImage. Task-number: QTBUG-104534 Pick-to: 6.2 6.3 6.4 Change-Id: Ib17c91c1e87d7544d1bf9a836f554f351c0b3968 Reviewed-by: Mike Krus <mike.krus@kdab.com>
-rw-r--r--src/plugins/renderers/rhi/renderer/renderer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp
index 65128a454..ea4f864fa 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderer.cpp
@@ -2744,13 +2744,14 @@ bool Renderer::executeCommandsSubmission(const RHIPassInfo &passInfo)
readBackResult->completed = [this, readBackResult, renderCaptureId, request] () {
const QImage::Format fmt = QImage::Format_RGBA8888_Premultiplied; // fits QRhiTexture::RGBA8
const uchar *p = reinterpret_cast<const uchar *>(readBackResult->data.constData());
- const QImage image(p, readBackResult->pixelSize.width(), readBackResult->pixelSize.height(), fmt);
+ const QImage image(p, readBackResult->pixelSize.width(), readBackResult->pixelSize.height(), fmt, [] (void *ptr) {
+ delete static_cast<QRhiReadbackResult *>(ptr);
+ }, readBackResult);
Render::RenderCapture *renderCapture = static_cast<Render::RenderCapture*>(m_nodesManager->frameGraphManager()->lookupNode(renderCaptureId));
renderCapture->addRenderCapture(request.captureId, image);
if (!Qt3DCore::contains(m_pendingRenderCaptureSendRequests, renderCaptureId))
m_pendingRenderCaptureSendRequests.push_back(renderCaptureId);
- delete readBackResult;
};
QRhiReadbackDescription readbackDesc;