diff options
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/context.cpp | 9 | ||||
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/softwarelayer.cpp | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/context.cpp b/src/plugins/scenegraph/softwarecontext/context.cpp index 345728f833..42780209c2 100644 --- a/src/plugins/scenegraph/softwarecontext/context.cpp +++ b/src/plugins/scenegraph/softwarecontext/context.cpp @@ -104,12 +104,17 @@ PixmapRenderer::PixmapRenderer(QSGRenderContext *context) void PixmapRenderer::renderScene(GLuint) { - Q_UNREACHABLE(); + class B : public QSGBindable + { + public: + void bind() const { } + } bindable; + QSGRenderer::renderScene(bindable); } void PixmapRenderer::render() { - Q_UNREACHABLE(); + } void PixmapRenderer::render(QPixmap *target) diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp index 70cb73fdaa..5dfcf2e20e 100644 --- a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp +++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp @@ -190,7 +190,7 @@ void SoftwareLayer::grab() if (!m_renderer) { m_renderer = new SoftwareContext::PixmapRenderer(m_context); - connect(m_renderer, SIGNAL(sceneGraphChanged()), this, SLOT(markDirtyTexture())); + connect(m_renderer, SIGNAL(sceneGraphChanged()), this, SLOT(markDirtyTextureLater())); } m_renderer->setDevicePixelRatio(m_device_pixel_ratio); m_renderer->setRootNode(static_cast<QSGRootNode *>(root)); @@ -206,10 +206,9 @@ void SoftwareLayer::grab() m_renderer->setDeviceRect(m_size); m_renderer->setViewportRect(m_size); - QRectF mirrored(m_rect.left(), m_rect.bottom(), m_rect.width(), -m_rect.height()); - m_renderer->setProjectionMatrixToRect(mirrored); m_renderer->setClearColor(Qt::transparent); + m_renderer->renderScene(); m_renderer->render(&m_pixmap); root->markDirty(QSGNode::DirtyForceUpdate); // Force matrix, clip, opacity and render list update. |