diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-03-05 17:19:43 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-03-06 08:25:36 +0000 |
| commit | bcc3de5bff2bae188a970c0e9572fb3f78c5bfeb (patch) | |
| tree | 125588262f23cb73a12c5de3ee128576b9ed978d /tests | |
| parent | 0d5a9ebc01a584ab4364e825a3d8a5dabd2ffd8b (diff) | |
Merge gatherer and caching jobs
Avoid extra thread sync just for copying data around
Change-Id: Ib119115bbb3a7a8a2aa99a3e271595caecc371f7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/opengl/renderer/tst_renderer.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/render/opengl/renderer/tst_renderer.cpp b/tests/auto/render/opengl/renderer/tst_renderer.cpp index abb1aee86..3deb9dc6b 100644 --- a/tests/auto/render/opengl/renderer/tst_renderer.cpp +++ b/tests/auto/render/opengl/renderer/tst_renderer.cpp @@ -162,11 +162,8 @@ private Q_SLOTS: 1 + // BufferGathererJob 1 + // TexturesGathererJob 1 + // LightGathererJob - 1 + // CacheLightJob 1 + // RenderableEntityFilterJob - 1 + // CacheRenderableEntitiesJob 1 + // ComputableEntityFilterJob - 1 + // CacheComputableEntitiesJob singleRenderViewJobCount + singleRenderViewCommandRebuildJobCount + layerCacheJobCount + @@ -260,7 +257,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // VAOGatherer 1 + // RenderableEntityFilterPtr - 1 + // SyncRenderableEntities singleRenderViewCommandRebuildJobCount + singleRenderViewJobCount); diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp index f0d02d63a..19ab51c8c 100644 --- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp @@ -344,7 +344,7 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.syncRenderViewPreCommandUpdateJob()->dependencies().contains(testAspect.renderer()->introspectShadersJob())); QVERIFY(renderViewBuilder.syncRenderViewPreCommandUpdateJob()->dependencies().contains(testAspect.renderer()->bufferGathererJob())); QVERIFY(renderViewBuilder.syncRenderViewPreCommandUpdateJob()->dependencies().contains(testAspect.renderer()->textureGathererJob())); - QVERIFY(renderViewBuilder.syncRenderViewPreCommandUpdateJob()->dependencies().contains(testAspect.renderer()->cacheLightJob())); + QVERIFY(renderViewBuilder.syncRenderViewPreCommandUpdateJob()->dependencies().contains(testAspect.renderer()->lightGathererJob())); // Step 5 for (const auto &renderViewBuilderJob : renderViewBuilder.renderViewCommandUpdaterJobs()) { @@ -471,7 +471,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderer->lightGathererJob()->lights().size(), 2); - QVERIFY(renderer->lightGathererJob()->takeEnvironmentLight() != nullptr); + QVERIFY(renderer->lightGathererJob()->environmentLight() != nullptr); } void checkRenderableEntitiesFilteringExecution() @@ -642,7 +642,6 @@ private Q_SLOTS: renderViewBuilder.buildJobHierachy(); renderer->renderableEntityFilterJob()->run(); - renderer->cacheRenderableEntitiesJob()->run(); renderViewBuilder.renderViewJob()->run(); renderViewBuilder.syncRenderViewPostInitializationJob()->run(); |