projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12a4ef6
)
QQuickWidget: resolve samples also when rendering is triggered from resize
author
Laszlo Agocs
<laszlo.agocs@digia.com>
Tue, 12 Aug 2014 09:58:58 +0000
(11:58 +0200)
committer
Laszlo Agocs
<laszlo.agocs@digia.com>
Thu, 14 Aug 2014 09:56:51 +0000
(11:56 +0200)
The normal update path did the resolving properly. However when we re-render
due to a resize, it was not done at all.
Change-Id: I3d55be111a4338e8f3dbb1081972f47daca53b35
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
src/quickwidgets/qquickwidget.cpp
patch
|
blob
|
history
diff --git
a/src/quickwidgets/qquickwidget.cpp
b/src/quickwidgets/qquickwidget.cpp
index
7aef165
..
ab4ccd7
100644
(file)
--- a/
src/quickwidgets/qquickwidget.cpp
+++ b/
src/quickwidgets/qquickwidget.cpp
@@
-910,8
+910,13
@@
void QQuickWidget::resizeEvent(QResizeEvent *e)
}
d->renderControl->render();
-
context->functions()->glFlush();
+
+ if (d->resolvedFbo) {
+ QRect rect(QPoint(0, 0), d->fbo->size());
+ QOpenGLFramebufferObject::blitFramebuffer(d->resolvedFbo, rect, d->fbo, rect);
+ }
+
context->doneCurrent();
}