diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-06-06 09:05:13 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2018-03-19 13:06:16 +0000 |
| commit | 4c3f6cb3d396d45d0a463c1222bb4185b9a015ab (patch) | |
| tree | 5698e4515eeb2d17fda101b8c8a140cb424a34dd /tests | |
| parent | 013be08f1b5b5884922ea5723c6dc34e27179ac7 (diff) | |
SendRenderCaptureJob: remove hard dependency to Renderer
This will allow it to be reused by the various renderers
Change-Id: I5707496a40b91077a363734cc72af820ec5ca8c4
Task-number: QTBUG-61151
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/render/renderer/tst_renderer.cpp | 21 | ||||
| -rw-r--r-- | tests/auto/render/sendrendercapturejob/tst_sendrendercapturejob.cpp | 3 |
2 files changed, 16 insertions, 8 deletions
diff --git a/tests/auto/render/renderer/tst_renderer.cpp b/tests/auto/render/renderer/tst_renderer.cpp index 9a435da28..d5961e9fd 100644 --- a/tests/auto/render/renderer/tst_renderer.cpp +++ b/tests/auto/render/renderer/tst_renderer.cpp @@ -90,12 +90,25 @@ private Q_SLOTS: QCOMPARE(jobs.size(), 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // updateSkinningPaletteJob singleRenderViewJobCount); // Only valid for the first call to renderBinJobs(), since subsequent calls won't have the renderqueue reset + renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); + + // WHEN + renderer.addRenderCaptureSendRequest(Qt3DCore::QNodeId::createId()); + jobs = renderer.renderBinJobs(); + + // THEN + QCOMPARE(jobs.size(), + 1 + // updateLevelOfDetailJob + 1 + // cleanupJob + 1 + // sendBufferCaptureJob + 1 + // sendRenderCaptureJob + 1 + // VAOGatherer + 1); // updateSkinningPaletteJob // WHEN renderer.markDirty(Qt3DRender::Render::AbstractRenderer::EntityEnabledDirty, nullptr); @@ -105,7 +118,6 @@ private Q_SLOTS: QCOMPARE(jobs.size(), 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // updateSkinningPaletteJob @@ -121,7 +133,6 @@ private Q_SLOTS: QCOMPARE(jobs.size(), 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // WorldTransformJob @@ -140,7 +151,6 @@ private Q_SLOTS: QCOMPARE(jobs.size(), 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // CalculateBoundingVolumeJob @@ -158,7 +168,6 @@ private Q_SLOTS: QCOMPARE(jobs.size(), 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // updateSkinningPaletteJob @@ -174,7 +183,6 @@ private Q_SLOTS: QCOMPARE(jobs.size(), 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // TexturesGathererJob @@ -200,7 +208,6 @@ private Q_SLOTS: 1 + // updateSkinningPaletteJob 1 + // updateLevelOfDetailJob 1 + // cleanupJob - 1 + // sendRenderCaptureJob 1 + // sendBufferCaptureJob 1 + // VAOGatherer 1 + // BufferGathererJob diff --git a/tests/auto/render/sendrendercapturejob/tst_sendrendercapturejob.cpp b/tests/auto/render/sendrendercapturejob/tst_sendrendercapturejob.cpp index c6bd65324..9cd2054d6 100644 --- a/tests/auto/render/sendrendercapturejob/tst_sendrendercapturejob.cpp +++ b/tests/auto/render/sendrendercapturejob/tst_sendrendercapturejob.cpp @@ -48,7 +48,7 @@ private Q_SLOTS: QImage image(10, 10, QImage::Format_ARGB32); Qt3DRender::Render::Renderer renderer(Qt3DRender::QRenderAspect::Synchronous); - Qt3DRender::Render::SendRenderCaptureJob job(&renderer); + Qt3DRender::Render::SendRenderCaptureJob job; Qt3DRender::Render::NodeManagers nodeManagers; nodeManagers.frameGraphManager()->appendNode(renderCapture->peerId(), renderCapture); @@ -59,6 +59,7 @@ private Q_SLOTS: auto request = renderCapture->takeCaptureRequest(); renderCapture->addRenderCapture(request.captureId, image); renderer.addRenderCaptureSendRequest(renderCapture->peerId()); + job.setPendingCaptureRequests(renderer.takePendingRenderCaptureSendRequests()); //WHEN job.run(); |