diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2016-04-11 13:59:39 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2016-04-11 11:38:13 +0000 |
| commit | f71a4ec688193a2882f0e9459965634c9aebbb44 (patch) | |
| tree | a8c04f8995f9c03020011d5a43f2bc1c0ec09d23 /src | |
| parent | dc58fc97ed9a36fa454eaa43e6f1cd7dc13a6d2d (diff) | |
Fix surface size setting
Now non-window sized viewports work, too.
Task-number: QTBUG-52498
Change-Id: Icc4aba3f93d78b4266a3b565156fe8799797baef
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Antti Määttä <antti.maatta@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/backend/renderview_p.h | 2 | ||||
| -rw-r--r-- | src/render/jobs/renderviewjobutils.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index 27896947a..cf9fd192f 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -245,7 +245,7 @@ public: void addSortCriteria(const QVector<Qt3DCore::QNodeId> &sortMethodUid) { m_data->m_sortingCriteria.append(sortMethodUid); } - void setSurface(QSurface *surface) { m_surface = surface; m_surfaceSize = surface->size(); } + void setSurface(QSurface *surface) { m_surface = surface; } QSurface *surface() const { return m_surface; } // Helps making the size of RenderView smaller diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index 6624eba11..40b8a2a43 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -232,6 +232,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN const Render::RenderSurfaceSelector *surfaceSelector = static_cast<const Render::RenderSurfaceSelector *>(node); rv->setSurface(surfaceSelector->surface()); + rv->setSurfaceSize(surfaceSelector->renderTargetSize()); } break; } |