diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-07 12:19:32 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-11 13:19:53 +0200 |
commit | 00f3f5c0a65e053c4075b92487fc77cfc33f2d5d (patch) | |
tree | ae68d9623cafda6d764ba32913518187cbb5deb6 /src/widgets/kernel/qwidget_p.h | |
parent | 9ba3145f797f09e69a07fb265cda257c56cf72ba (diff) |
Fix msaa in QOpenGLWidget
Take the correct number of samples from the widget's context, not the
tlw's context.
The original implementation did the blit only after paintGL(). This is
not sufficient for applications that override paintEvent() and do QPainter
calls in there (e.g. the 2dpainting example). Therefore the approach is
changed to perform the resolving of the samples in a function that is
invoked by QWidgetPrivate every time a paint event is sent.
Change-Id: Iae0b2c30f6070ec75201339a848854e4582a9c0c
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/widgets/kernel/qwidget_p.h')
-rw-r--r-- | src/widgets/kernel/qwidget_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 011d456a39..1a34ee504c 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -653,6 +653,8 @@ public: // filtered away from the widget. This is fine for QGLWidget but bad for QOpenGLWidget // since the fbo must be resized. We need an alternative way to notify. virtual void resizeViewportFramebuffer() { } + // Called after each paint event. + virtual void resolveSamples() { } #endif // Variables. |