diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 11:55:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 11:56:26 +0000 |
| commit | a400bbe50deb98f5d924cd4f6562e1b868e73248 (patch) | |
| tree | a636e2224d3677aca2406bac5d835100610500e3 /tests/auto/render/renderer/tst_renderer.cpp | |
| parent | d360e16fdcab2197924e2505695c412bcaadbbe0 (diff) | |
| parent | 1382b0cfb336cc04924d61b46f0b69dadb1c3d39 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into refs/staging/5.11v5.11.0-alpha1
Diffstat (limited to 'tests/auto/render/renderer/tst_renderer.cpp')
| -rw-r--r-- | tests/auto/render/renderer/tst_renderer.cpp | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/tests/auto/render/renderer/tst_renderer.cpp b/tests/auto/render/renderer/tst_renderer.cpp index a2ea993e8..cfccf8b78 100644 --- a/tests/auto/render/renderer/tst_renderer.cpp +++ b/tests/auto/render/renderer/tst_renderer.cpp @@ -60,6 +60,9 @@ private Q_SLOTS: renderer.setSettings(&settings); renderer.initialize(); + // NOTE: FilterCompatibleTechniqueJob and ShaderGathererJob cannot run because the context + // is not initialized in this test + const int singleRenderViewJobCount = 11 + 1 * Qt3DRender::Render::RenderViewBuilder::optimalJobCount(); // RenderViewBuilder renderViewJob, // renderableEntityFilterJob, @@ -84,7 +87,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // updateSkinningPaletteJob singleRenderViewJobCount); // Only valid for the first call to renderBinJobs(), since subsequent calls won't have the renderqueue reset @@ -100,7 +102,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // updateSkinningPaletteJob 1); // EntityEnabledDirty @@ -117,7 +118,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // WorldTransformJob 1 + // UpdateWorldBoundingVolume @@ -137,7 +137,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // CalculateBoundingVolumeJob 1 + // UpdateMeshTriangleListJob @@ -156,7 +155,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // updateSkinningPaletteJob 1); // BufferGathererJob @@ -164,23 +162,6 @@ private Q_SLOTS: renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); // WHEN - renderer.markDirty(Qt3DRender::Render::AbstractRenderer::ShadersDirty, nullptr); - jobs = renderer.renderBinJobs(); - - // THEN (level - QCOMPARE(jobs.size(), - 1 + // updateLevelOfDetailJob - 1 + // cleanupJob - 1 + // sendRenderCaptureJob - 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob - 1 + // VAOGatherer - 1 + // updateSkinningPaletteJob - 1); // ShaderGathererJob - - renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); - - // WHEN renderer.markDirty(Qt3DRender::Render::AbstractRenderer::TexturesDirty, nullptr); jobs = renderer.renderBinJobs(); @@ -190,7 +171,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // TexturesGathererJob 1 + // updateSkinningPaletteJob @@ -208,7 +188,6 @@ private Q_SLOTS: 1 + // cleanupJob 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob - 1 + // filterCompatibleTechniquesJob 1 + // VAOGatherer 1 + // EntityEnabledDirty 1 + // WorldTransformJob @@ -218,7 +197,6 @@ private Q_SLOTS: 1 + // CalculateBoundingVolumeJob 1 + // UpdateMeshTriangleListJob 1 + // BufferGathererJob - 1 + // ShaderGathererJob 1 + // TexturesGathererJob 1 + // updateSkinningPaletteJob 1); // SyncTexturesGathererJob |