ViewportNode: make computeViewport a static function

Change-Id: I8d4362830457df149791b8c2472cb123b6222bf3
Reviewed-by: Mike Krus <mike.krus@kdab.com>

4 files changed, 5 insertions, 4 deletions

diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp
index b68f7b55b..bed87a13f 100644
--- a/src/render/framegraph/viewportnode.cpp
+++ b/src/render/framegraph/viewportnode.cpp
@@ -136,7 +136,7 @@ void ViewportNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     FrameGraphNode::sceneChangeEvent(e);
 }
 
-QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentViewport)
+QRectF ViewportNode::computeViewport(const QRectF &childViewport, const ViewportNode *parentViewport)
 {
     QRectF vp(parentViewport->xMin(),
               parentViewport->yMin(),
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index f0a1f9b0d..799b9b3dc 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -86,6 +86,8 @@ public:
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
+    static QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentViewport);
+
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
@@ -96,7 +98,6 @@ private:
     float m_gamma;
 };
 
-QRectF computeViewport(const QRectF &childViewport, const ViewportNode *parentViewport);
 
 } // namespace Render
 } // namespace Qt3DRender
diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp
index ec5af190c..a9c2aee10 100644
--- a/src/render/jobs/pickboundingvolumeutils.cpp
+++ b/src/render/jobs/pickboundingvolumeutils.cpp
@@ -86,7 +86,7 @@ ViewportCameraAreaDetails ViewportCameraAreaGatherer::gatherUpViewportCameraArea
                 vca.cameraId = static_cast<const CameraSelector *>(node)->cameraUuid();
                 break;
             case FrameGraphNode::Viewport:
-                vca.viewport = computeViewport(vca.viewport, static_cast<const ViewportNode *>(node));
+                vca.viewport = ViewportNode::computeViewport(vca.viewport, static_cast<const ViewportNode *>(node));
                 break;
             case FrameGraphNode::Surface: {
                 auto selector = static_cast<const RenderSurfaceSelector *>(node);
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
index ffad387c6..40fe71b2f 100644
--- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
@@ -168,7 +168,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
                 // Make it so that the new viewport is actually
                 // a subregion relative to that of the parent viewport
                 const ViewportNode *vpNode = static_cast<const ViewportNode *>(node);
-                rv->setViewport(computeViewport(rv->viewport(), vpNode));
+                rv->setViewport(ViewportNode::computeViewport(rv->viewport(), vpNode));
                 rv->setGamma(vpNode->gamma());
                 break;
             }