← Back to branch summary

~saviq/qtubuntu/revert-occlude-lp1620297

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/integration.h

  • Committer: Bileto Bot
  • Author(s): Gerry Boland
  • Date: 2016-08-09 23:00:16 UTC
  • mfrom: (328.3.4 eglconvenience-retry)
  • Revision ID: ci-train-bot@canonical.com-20160809230016-nutnvedrejhvzrdc
Reapply rev 324 plus fix: EGL convenience, plus workaround for hybris not supporting GLESv3. (LP: #1507817, #1594198)

Approved by: Daniel d'Andrada, Unity8 CI Bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/integration.h
62
62
 
63
63
    // New methods.
64
64
    MirConnection *mirConnection() const { return mMirConnection; }
65
 
    QSurfaceFormat surfaceFormat() const { return mSurfaceFormat; }
66
65
    EGLDisplay eglDisplay() const { return mEglDisplay; }
67
 
    EGLConfig eglConfig() const { return mEglConfig; }
68
66
    EGLNativeDisplayType eglNativeDisplay() const { return mEglNativeDisplay; }
69
67
    UbuntuScreenObserver *screenObserver() const { return mScreenObserver.data(); }
70
68
 
97
95
 
98
96
    // EGL related
99
97
    EGLDisplay mEglDisplay{EGL_NO_DISPLAY};
100
 
    EGLConfig mEglConfig{nullptr};
101
98
    EGLNativeDisplayType mEglNativeDisplay;
102
 
    QSurfaceFormat mSurfaceFormat;
103
99
};
104
100
 
105
101
#endif // UBUNTU_CLIENT_INTEGRATION_H