1
=== modified file 'src/ubuntumirclient/qmirclientbackingstore.cpp'
2
--- src/ubuntumirclient/qmirclientbackingstore.cpp	2017-02-21 13:23:47 +0000
3
+++ src/ubuntumirclient/qmirclientbackingstore.cpp	2017-03-24 15:27:00 +0000
4
@@ -40,6 +40,7 @@
5
40
40
6
41
#include "qmirclientbackingstore.h"
41
#include "qmirclientbackingstore.h"
7
42
#include "qmirclientlogging.h"
42
#include "qmirclientlogging.h"
8
43
#include <QtGui/QOffscreenSurface>
9
43
#include <QtGui/QOpenGLContext>
44
#include <QtGui/QOpenGLContext>
10
44
#include <QtGui/QOpenGLTexture>
45
#include <QtGui/QOpenGLTexture>
11
45
#include <QtGui/QMatrix4x4>
46
#include <QtGui/QMatrix4x4>
12
@@ -61,12 +62,21 @@
13
61
62
14
62
QMirClientBackingStore::~QMirClientBackingStore()
63
QMirClientBackingStore::~QMirClientBackingStore()
15
63
{
64
{
16
65
    if (!mTexture->isCreated())
17
66
        return;
18
67
19
64
    // Paraphrasing QOpenGLCompositorBackingStore: "With render-to-texture-widgets QWidget makes
68
    // Paraphrasing QOpenGLCompositorBackingStore: "With render-to-texture-widgets QWidget makes
20
65
    // sure the context is made current before destroying backingstores. That is however not the
69
    // sure the context is made current before destroying backingstores. That is however not the
24
66
    // case for windows with regular widgets only.
70
    // case for windows with regular widgets only."
25
67
    if (!QOpenGLContext::currentContext()) {
71
    auto context = QOpenGLContext::currentContext();
26
68
        mContext->makeCurrent(window());
72
    if (!context) { // QWindow's backing QPlatformSurface probably gone, use temp one for cleanup
27
73
        QOffscreenSurface tempSurface;
28
74
        tempSurface.setFormat(mContext->format());
29
75
        tempSurface.create();
30
76
        mContext->makeCurrent(&tempSurface);
31
69
    }
77
    }
32
78
    // QOpenGLTexture will go out of scope, is then deleted. Then QOpenGLContext falls out of
33
79
    // scope, calls doneCurrent and is then deleted.
34
70
}
80
}
35
71
81
36
72
void QMirClientBackingStore::flush(QWindow* window, const QRegion& region, const QPoint& offset)
82
void QMirClientBackingStore::flush(QWindow* window, const QRegion& region, const QPoint& offset)
Status:	Merged
Approved by:	Daniel d'Andrada on 2017-03-24
Approved revision:	384
Merged at revision:	386
Proposed branch:	lp:~gerboland/qtubuntu/fix-test-crash-backingstore
Merge into:	lp:qtubuntu
Diff against target:	36 lines (+13/-3) 1 file modified src/ubuntumirclient/qmirclientbackingstore.cpp (+13/-3)
To merge this branch:	bzr merge lp:~gerboland/qtubuntu/fix-test-crash-backingstore
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2017-03-13	Approve on 2017-03-24
Unity8 CI Bot	continuous-integration	2017-03-13	Approve on 2017-03-24
Review via email: mp+319695@code.launchpad.net