diff options
author | Svenn-Arne Dragly <svenn-arne.dragly@qt.io> | 2018-01-22 10:42:55 +0100 |
---|---|---|
committer | Svenn-Arne Dragly <svenn-arne.dragly@qt.io> | 2018-02-02 10:20:11 +0000 |
commit | 46319648436814afb5a77755dde6681e304befaf (patch) | |
tree | 9a608913dd9be2ac99bb8e5ebf446dddd69c4c4f /src/render/jobs/loadtexturedatajob_p.h | |
parent | 30abe028f9a95fa32fbb77cb60063d062e13f7ff (diff) |
Keep rendering in sync with aspect jobs by adding barriers
This makes sure that jobs that depend on a specific state of the
renderer (such as context being initialized) never run before this
is the case. This reduces the number of possible race conditions
and checks we need to do to ensure the jobs and the renderer are in
the correct state.
This way we no longer swap buffers when nothing has been rendered,
which in turn makes sure that we only draw one frame when the
render policy is OnDemand and there are no changes.
This change also adds a number of assertions on pointers to
resources to make it easier to detect missing job dependencies.
Finally, this change overhauls the job dependencies in
Renderer and RenderViewBuilder.
Task-number: QTBUG-66024
Change-Id: I3e4e9dd0dd53b5c88f5c1b17d68df42f28eae794
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/jobs/loadtexturedatajob_p.h')
-rw-r--r-- | src/render/jobs/loadtexturedatajob_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h index 36fdd950b..49900a090 100644 --- a/src/render/jobs/loadtexturedatajob_p.h +++ b/src/render/jobs/loadtexturedatajob_p.h @@ -67,8 +67,7 @@ class NodeManagers; class LoadTextureDataJob : public Qt3DCore::QAspectJob { public: - LoadTextureDataJob(const QTextureGeneratorPtr &texGen); - LoadTextureDataJob(const QTextureImageDataGeneratorPtr &imgDataGen); + LoadTextureDataJob(); ~LoadTextureDataJob(); inline void setNodeManagers(NodeManagers *manager) { m_manager = manager; } @@ -77,9 +76,6 @@ protected: void run() Q_DECL_FINAL; private: - QTextureGeneratorPtr m_texGen; - QTextureImageDataGeneratorPtr m_imgDataGen; - NodeManagers *m_manager; }; |