From bfa9e94600d4decdf0dfe8e522a5bf468a4a512e Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 6 May 2020 18:25:23 +0200 Subject: Remove OpenGL FBO references in QQuickWindow and the renderer API setRenderTarget(GLuint), setRenderTarget(QQuickFramebufferObject*), renderScene(uint fboId), QSGBindable, etc. are now removed. This leads to a simpler and cleaner interface in QSGAbstractRenderer and QSGRenderer because the somewhat weird renderScene() overloading (where one version is virtual, while the other isn't) is now avoided, with just a single renderScene() virtual now. Task-number: QTBUG-84040 Change-Id: I0ce5a159a557688bdfcb7cacf8a9d12d6fd970d1 Reviewed-by: Eirik Aavitsland --- .../adaptations/software/qsgsoftwarepixmaprenderer.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp') diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp index 4a6d73ec59..bdb23656fd 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepixmaprenderer.cpp @@ -59,14 +59,9 @@ QSGSoftwarePixmapRenderer::~QSGSoftwarePixmapRenderer() } -void QSGSoftwarePixmapRenderer::renderScene(uint) +void QSGSoftwarePixmapRenderer::renderScene() { - class B : public QSGBindable - { - public: - void bind() const override { } - } bindable; - QSGRenderer::renderScene(bindable); + QSGRenderer::renderScene(); } void QSGSoftwarePixmapRenderer::render() -- cgit v1.2.3