diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-02-09 08:54:07 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-11 12:50:13 +0000 |
commit | 83d81bc82eb7ca8d2ed113aac14f9a2d0a40a362 (patch) | |
tree | f75d87c176a18feefe7cedd89ddecd8f490893c3 /src/plugins/renderers/opengl/renderer | |
parent | c86ffa60f07d7ee77f835ad4d8383b599dd9886e (diff) |
Remove buffer functor API
Change-Id: I78cc60ff634f909111b891d5b9716e19cae35f3b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/renderers/opengl/renderer')
-rw-r--r-- | src/plugins/renderers/opengl/renderer/renderer.cpp | 29 | ||||
-rw-r--r-- | src/plugins/renderers/opengl/renderer/renderer_p.h | 2 |
2 files changed, 0 insertions, 31 deletions
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp index cc49697fd..a50a770eb 100644 --- a/src/plugins/renderers/opengl/renderer/renderer.cpp +++ b/src/plugins/renderers/opengl/renderer/renderer.cpp @@ -74,7 +74,6 @@ #include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DRender/private/techniquemanager_p.h> #include <Qt3DRender/private/platformsurfacefilter_p.h> -#include <Qt3DRender/private/loadbufferjob_p.h> #include <Qt3DRender/private/rendercapture_p.h> #include <Qt3DRender/private/updatelevelofdetailjob_p.h> #include <Qt3DRender/private/buffercapture_p.h> @@ -1895,17 +1894,11 @@ QVector<QAspectJobPtr> Renderer::preRenderingJobs() QVector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs() { QVector<QAspectJobPtr> renderBinJobs; - // Create the jobs to build the frame - const QVector<QAspectJobPtr> bufferJobs = createRenderBufferJobs(); // Remove previous dependencies m_calculateBoundingVolumeJob->removeDependency(QWeakPointer<QAspectJob>()); m_cleanupJob->removeDependency(QWeakPointer<QAspectJob>()); - // Set dependencies - for (const QAspectJobPtr &bufferJob : bufferJobs) - m_calculateBoundingVolumeJob->addDependency(bufferJob); - m_updateLevelOfDetailJob->setFrameGraphRoot(frameGraphRoot()); const BackendNodeDirtySet dirtyBitsForFrame = m_dirtyBits.marked | m_dirtyBits.remaining; @@ -1945,7 +1938,6 @@ QVector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs() renderBinJobs.push_back(m_updateSkinningPaletteJob); renderBinJobs.push_back(m_updateLevelOfDetailJob); renderBinJobs.push_back(m_cleanupJob); - renderBinJobs.append(bufferJobs); // Jobs to prepare GL Resource upload renderBinJobs.push_back(m_vaoGathererJob); @@ -2429,27 +2421,6 @@ SubmissionContext *Renderer::submissionContext() const return m_submissionContext.data(); } -// Returns a vector of jobs to be performed for dirty buffers -// 1 dirty buffer == 1 job, all job can be performed in parallel -QVector<Qt3DCore::QAspectJobPtr> Renderer::createRenderBufferJobs() const -{ - const QVector<QNodeId> dirtyBuffers = m_nodesManager->bufferManager()->takeDirtyBuffers(); - QVector<QAspectJobPtr> dirtyBuffersJobs; - dirtyBuffersJobs.reserve(dirtyBuffers.size()); - - for (const QNodeId bufId : dirtyBuffers) { - Render::HBuffer bufferHandle = m_nodesManager->lookupHandle<Render::Buffer, Render::BufferManager, Render::HBuffer>(bufId); - if (!bufferHandle.isNull()) { - // Create new buffer job - auto job = Render::LoadBufferJobPtr::create(bufferHandle); - job->setNodeManager(m_nodesManager); - dirtyBuffersJobs.push_back(job); - } - } - - return dirtyBuffersJobs; -} - } // namespace OpenGL } // namespace Render } // namespace Qt3DRender diff --git a/src/plugins/renderers/opengl/renderer/renderer_p.h b/src/plugins/renderers/opengl/renderer/renderer_p.h index 8c3a252bb..5999aabe3 100644 --- a/src/plugins/renderers/opengl/renderer/renderer_p.h +++ b/src/plugins/renderers/opengl/renderer/renderer_p.h @@ -232,8 +232,6 @@ public: Qt3DCore::QAspectJobPtr syncLoadingJobs() override; Qt3DCore::QAspectJobPtr expandBoundingVolumeJob() override; - QVector<Qt3DCore::QAspectJobPtr> createRenderBufferJobs() const; - inline FrameCleanupJobPtr frameCleanupJob() const { return m_cleanupJob; } inline UpdateShaderDataTransformJobPtr updateShaderDataTransformJob() const { return m_updateShaderDataTransformJob; } inline CalculateBoundingVolumeJobPtr calculateBoundingVolumeJob() const { return m_calculateBoundingVolumeJob; } |