diff options
Diffstat (limited to 'examples/quick/rendercontrol/window_singlethreaded.cpp')
-rw-r--r-- | examples/quick/rendercontrol/window_singlethreaded.cpp | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp index 5377c56376..1e81f08f7e 100644 --- a/examples/quick/rendercontrol/window_singlethreaded.cpp +++ b/examples/quick/rendercontrol/window_singlethreaded.cpp @@ -48,6 +48,7 @@ #include <QOpenGLBuffer> #include <QOpenGLVertexArrayObject> #include <QOffscreenSurface> +#include <QScreen> #include <QQmlEngine> #include <QQmlComponent> #include <QQuickItem> @@ -55,11 +56,29 @@ #include <QQuickRenderControl> #include <QCoreApplication> +class RenderControl : public QQuickRenderControl +{ +public: + RenderControl(QWindow *w) : m_window(w) { } + QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE; + +private: + QWindow *m_window; +}; + +QWindow *RenderControl::renderWindow(QPoint *offset) +{ + if (offset) + *offset = QPoint(0, 0); + return m_window; +} + WindowSingleThreaded::WindowSingleThreaded() : m_rootItem(0), m_fbo(0), m_quickInitialized(false), - m_quickReady(false) + m_quickReady(false), + m_dpr(0) { setSurfaceType(QSurface::OpenGLSurface); @@ -83,7 +102,7 @@ WindowSingleThreaded::WindowSingleThreaded() m_cubeRenderer = new CubeRenderer(m_offscreenSurface); - m_renderControl = new QQuickRenderControl(this); + m_renderControl = new RenderControl(this); // Create a QQuickWindow that is associated with out render control. Note that this // window never gets created or shown, meaning that it will never get an underlying @@ -108,6 +127,11 @@ WindowSingleThreaded::WindowSingleThreaded() connect(m_quickWindow, &QQuickWindow::sceneGraphInvalidated, this, &WindowSingleThreaded::destroyFbo); connect(m_renderControl, &QQuickRenderControl::renderRequested, this, &WindowSingleThreaded::requestUpdate); connect(m_renderControl, &QQuickRenderControl::sceneChanged, this, &WindowSingleThreaded::requestUpdate); + + // Just recreating the FBO on resize is not sufficient, when moving between screens + // with different devicePixelRatio the QWindow size may remain the same but the FBO + // dimension is to change regardless. + connect(this, &QWindow::screenChanged, this, &WindowSingleThreaded::handleScreenChange); } WindowSingleThreaded::~WindowSingleThreaded() @@ -139,7 +163,8 @@ void WindowSingleThreaded::createFbo() { // The scene graph has been initialized. It is now time to create an FBO and associate // it with the QQuickWindow. - m_fbo = new QOpenGLFramebufferObject(size() * devicePixelRatio(), QOpenGLFramebufferObject::CombinedDepthStencil); + m_dpr = devicePixelRatio(); + m_fbo = new QOpenGLFramebufferObject(size() * m_dpr, QOpenGLFramebufferObject::CombinedDepthStencil); m_quickWindow->setRenderTarget(m_fbo); } @@ -246,18 +271,31 @@ void WindowSingleThreaded::exposeEvent(QExposeEvent *) } } -void WindowSingleThreaded::resizeEvent(QResizeEvent *) +void WindowSingleThreaded::resizeFbo() { - // If this is a resize after the scene is up and running, recreate the fbo and the - // Quick item and scene. if (m_rootItem && m_context->makeCurrent(m_offscreenSurface)) { delete m_fbo; createFbo(); m_context->doneCurrent(); updateSizes(); + render(); } } +void WindowSingleThreaded::resizeEvent(QResizeEvent *) +{ + // If this is a resize after the scene is up and running, recreate the fbo and the + // Quick item and scene. + if (m_fbo && m_fbo->size() != size() * devicePixelRatio()) + resizeFbo(); +} + +void WindowSingleThreaded::handleScreenChange() +{ + if (m_dpr != devicePixelRatio()) + resizeFbo(); +} + void WindowSingleThreaded::mousePressEvent(QMouseEvent *e) { // Use the constructor taking localPos and screenPos. That puts localPos into the |