diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-06-09 09:08:28 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2018-03-19 09:06:31 +0000 |
| commit | ab046302d593be2bfc368a321417a208d88f53ca (patch) | |
| tree | dc7dc264c0673d929d186435f6fa09b279aff1db | |
| parent | 34f6d8a88677cffa44be05da7e1e2da0cfc2f3b4 (diff) | |
RenderThread: use AbstractRenderer* instead of Renderer*
So that we can reuse the RenderThread class with different
types of renderers.
Change-Id: I797b599d64f5c846b8e2ae95eba2394033a1e4b0
Task-number: QTBUG-61151
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/render/backend/abstractrenderer_p.h | 1 | ||||
| -rw-r--r-- | src/render/backend/renderthread.cpp | 6 | ||||
| -rw-r--r-- | src/render/backend/renderthread_p.h | 8 | ||||
| -rw-r--r-- | src/render/picking/raycaster.cpp | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h index 182c4ea36..1cf0c60ae 100644 --- a/src/render/backend/abstractrenderer_p.h +++ b/src/render/backend/abstractrenderer_p.h @@ -51,6 +51,7 @@ // #include <QtCore/qflags.h> +#include <QtCore/qmutex.h> #include <Qt3DRender/private/qt3drender_global_p.h> #include <Qt3DCore/qaspectjob.h> #include <Qt3DCore/qnodeid.h> diff --git a/src/render/backend/renderthread.cpp b/src/render/backend/renderthread.cpp index 6b95ed396..05abf7210 100644 --- a/src/render/backend/renderthread.cpp +++ b/src/render/backend/renderthread.cpp @@ -38,9 +38,7 @@ ****************************************************************************/ #include "renderthread_p.h" -#include <Qt3DRender/private/renderer_p.h> -#include <Qt3DRender/private/renderview_p.h> - +#include <Qt3DRender/private/abstractrenderer_p.h> #include <Qt3DRender/private/renderlogging_p.h> #include <QEventLoop> #include <QTime> @@ -52,7 +50,7 @@ namespace Qt3DRender { namespace Render { -RenderThread::RenderThread(Renderer *renderer) +RenderThread::RenderThread(AbstractRenderer *renderer) : QThread(), m_renderer(renderer), m_semaphore(0) diff --git a/src/render/backend/renderthread_p.h b/src/render/backend/renderthread_p.h index 6bb0c7c35..56a7ec3bc 100644 --- a/src/render/backend/renderthread_p.h +++ b/src/render/backend/renderthread_p.h @@ -61,24 +61,24 @@ namespace Qt3DRender { namespace Render { -class Renderer; +class AbstractRenderer; class Q_AUTOTEST_EXPORT RenderThread : public QThread { Q_OBJECT public: - explicit RenderThread(Renderer *renderer); + explicit RenderThread(AbstractRenderer *renderer); ~RenderThread(); void waitForStart( Priority priority = InheritPriority ); - Render::Renderer* renderer() const { return m_renderer; } + Render::AbstractRenderer* renderer() const { return m_renderer; } protected: void run() override; private: - Renderer* m_renderer; + AbstractRenderer* m_renderer; QSemaphore m_semaphore; }; diff --git a/src/render/picking/raycaster.cpp b/src/render/picking/raycaster.cpp index d62bdab09..a5fbf1206 100644 --- a/src/render/picking/raycaster.cpp +++ b/src/render/picking/raycaster.cpp @@ -39,7 +39,7 @@ #include "raycaster_p.h" #include "qpickevent.h" -#include "renderer_p.h" +#include <Qt3DRender/private/abstractrenderer_p.h> #include <Qt3DRender/qabstractraycaster.h> #include <Qt3DRender/private/qabstractraycaster_p.h> #include <Qt3DRender/private/raycastingjob_p.h> |