summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2018-03-08 15:23:35 +0100
committerMike Krus <mike.krus@kdab.com>2020-02-03 14:50:26 +0000
commitf1f387c22dac8748a7edb1f4aa1ea6dac7dfbdfd (patch)
tree07f6c5a7663035a51e4b37ccac5e8e68a3a2f2c7 /tests
parent1e2f6baf6bdcc647b40d346040b8383cf81a2ef3 (diff)
ResourceAccessor: make it work with the modular renderer architecture
This makes Scene2D work again. Tests restored as well. Change-Id: I4082d362c999a674be2debc297d59075f4b7c9e9 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/render/commons/testrenderer.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 1241bb0e0..7b3e0a387 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -30,6 +30,7 @@
#define TESTRENDERER_H
#include <Qt3DRender/private/abstractrenderer_p.h>
+#include <Qt3DRender/private/resourceaccessor_p.h>
QT_BEGIN_NAMESPACE
@@ -42,11 +43,15 @@ public:
void dumpInfo() const override {}
API api() const override { return AbstractRenderer::OpenGL; }
qint64 time() const override { return 0; }
- void setTime(qint64 time) override { Q_UNUSED(time) }
+ void setTime(qint64 time) override { Q_UNUSED(time); }
+ void setNodeManagers(Qt3DRender::Render::NodeManagers *m) override
+ {
+ m_managers = m;
+ m_resourceAccessor.reset(new Qt3DRender::Render::ResourceAccessor(this, m_managers));
+ }
+ void setServices(Qt3DCore::QServiceLocator *services) override { Q_UNUSED(services); }
+ void setSurfaceExposed(bool exposed) override { Q_UNUSED(exposed); }
void setJobsInLastFrame(int jobsInLastFrame) override { Q_UNUSED(jobsInLastFrame) }
- void setNodeManagers(Qt3DRender::Render::NodeManagers *m) override { m_managers = m; }
- void setServices(Qt3DCore::QServiceLocator *services) override { Q_UNUSED(services) }
- void setSurfaceExposed(bool exposed) override { Q_UNUSED(exposed) }
Qt3DRender::Render::NodeManagers *nodeManagers() const override { return m_managers; }
Qt3DCore::QServiceLocator *services() const override { return nullptr; }
void initialize() override {}
@@ -87,12 +92,15 @@ public:
QSurfaceFormat format() override;
void setOpenGLContext(QOpenGLContext *) override {}
+ bool accessOpenGLTexture(Qt3DCore::QNodeId, QOpenGLTexture **, QMutex **, bool) override { return false; }
+ QSharedPointer<Qt3DRender::Render::RenderBackendResourceAccessor> resourceAccessor() const override { return m_resourceAccessor; }
void loadShader(Qt3DRender::Render::Shader *, Qt3DRender::Render::HShader) override {}
protected:
Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet m_changes;
Qt3DRender::Render::NodeManagers *m_managers = nullptr;
+ QSharedPointer<Qt3DRender::Render::ResourceAccessor> m_resourceAccessor;
};
QT_END_NAMESPACE