diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-07 18:08:29 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-07 18:10:43 +0000 |
| commit | b0eb152b82cdd9658154ff7d9ef9e764eccc1ebd (patch) | |
| tree | d754ad4412d5c1d26caedd54f2455f3e27cbbd46 /tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp | |
| parent | 137b0cbbc746eecc6dd6a93f9a268f8d42c96bcc (diff) | |
| parent | fa6799f63f3211300705b814b97716ca689d4bfa (diff) | |
Merge remote-tracking branch 5.15 into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp')
| -rw-r--r-- | tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp index 210d82dcf..340bfdda4 100644 --- a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp +++ b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp @@ -37,7 +37,7 @@ #include <Qt3DRender/private/entity_p.h> #include <Qt3DRender/qrenderaspect.h> #include <Qt3DRender/private/qrenderaspect_p.h> -#include <Qt3DRender/private/materialparametergathererjob_p.h> +#include <materialparametergathererjob_p.h> #include <Qt3DRender/private/technique_p.h> #include <Qt3DRender/private/techniquemanager_p.h> #include <Qt3DExtras/qphongmaterial.h> @@ -90,9 +90,9 @@ public: return d_func()->m_renderer->nodeManagers(); } - Render::MaterialParameterGathererJobPtr materialGathererJob() const + Render::OpenGL::MaterialParameterGathererJobPtr materialGathererJob() const { - Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create(); + Render::OpenGL::MaterialParameterGathererJobPtr job = Render::OpenGL::MaterialParameterGathererJobPtr::create(); job->setNodeManagers(nodeManagers()); return job; } @@ -136,7 +136,7 @@ private Q_SLOTS: QScopedPointer<Qt3DRender::TestAspect> aspect(new Qt3DRender::TestAspect(buildTestScene(2000))); // WHEN - Qt3DRender::Render::MaterialParameterGathererJobPtr gatheringJob = aspect->materialGathererJob(); + Qt3DRender::Render::OpenGL::MaterialParameterGathererJobPtr gatheringJob = aspect->materialGathererJob(); gatheringJob->setHandles(aspect->nodeManagers()->materialManager()->activeHandles()); QBENCHMARK { |