From 412f9985bd59b1c46407eda67b963cbdbdc48e4b Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 12 Dec 2016 15:31:32 +0000 Subject: Ensure offscreen surface used during cleanup is created on gui thread Windows uses a QWindow to back QOffscreenSurface so we must needs create it on the gui thread. To complicate matters we don't know the format used by Qt 3D until the Renderer is initialized. So we have to defer creation of the offscreen surface until that time and do it in the gui thread with the correct format. Task-number: QTBUG-57496 Change-Id: Idaad23c2229ab069f3e02c8d075be8e6718a8a50 Reviewed-by: Paul Lemire --- src/render/frontend/qrenderaspect_p.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/render/frontend/qrenderaspect_p.h') diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index f196c2ec2..d2c789ada 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -67,6 +67,10 @@ class AbstractRenderer; class NodeManagers; } +namespace Render { +class OffscreenSurfaceHelper; +} + class QT3DRENDERSHARED_PRIVATE_EXPORT QRenderAspectPrivate : public Qt3DCore::QAbstractAspectPrivate { public: @@ -89,6 +93,7 @@ public: bool m_initialized; QList m_sceneIOHandler; QRenderAspect::RenderType m_renderType; + Render::OffscreenSurfaceHelper *m_offscreenHelper; }; } -- cgit v1.2.3