Merge lp:~chrisccoulson/qtubuntu/lp1278470 into lp:qtubuntu

[Chris Coulson]

Pass the EGL share context to eglCreateContext (lp: #1278470)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~chrisccoulson/qtubuntu/lp1278470/+merge/205609/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/113/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/27/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/116/rebuild

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

Nice job!

review: Approve

[lp:~chrisccoulson/qtubuntu/lp1278470]

206. By Chris Coulson on 2014-03-18

Merge from trunk

=== modified file 'src/platforms/base/context.cc'
--- src/platforms/base/context.cc	2014-01-31 00:02:16 +0000
+++ src/platforms/base/context.cc	2014-03-18 16:39:15 +0000
@@ -46,7 +46,8 @@
 #endif
 }
 
-QUbuntuBaseContext::QUbuntuBaseContext(QUbuntuBaseScreen* screen) {
+QUbuntuBaseContext::QUbuntuBaseContext(QUbuntuBaseScreen* screen,
+                                       QUbuntuBaseContext* share) {
   DASSERT(screen != NULL);
   eglDisplay_ = screen->eglDisplay();
   screen_ = screen;
@@ -58,7 +59,8 @@
   attribs.append(EGL_NONE);
   ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
   ASSERT((eglContext_ = eglCreateContext(
-      eglDisplay_, screen->eglConfig(), EGL_NO_CONTEXT, attribs.constData())) != EGL_NO_CONTEXT);
+      eglDisplay_, screen->eglConfig(), share ? share->eglContext() : EGL_NO_CONTEXT,
+      attribs.constData())) != EGL_NO_CONTEXT);
 
   DLOG("QUbuntuBaseContext::QUbuntuBaseContext (this=%p, screen=%p)", this, screen);
 }

=== modified file 'src/platforms/base/context.h'
--- src/platforms/base/context.h	2013-02-14 16:31:33 +0000
+++ src/platforms/base/context.h	2014-03-18 16:39:15 +0000
@@ -21,7 +21,8 @@
 
 class QUbuntuBaseContext : public QPlatformOpenGLContext {
  public:
-  QUbuntuBaseContext(QUbuntuBaseScreen* screen);
+  QUbuntuBaseContext(QUbuntuBaseScreen* screen,
+                     QUbuntuBaseContext* share);
   ~QUbuntuBaseContext();
 
   // QPlatformOpenGLContext methods.

=== modified file 'src/platforms/base/integration.cc'
--- src/platforms/base/integration.cc	2013-11-06 12:44:39 +0000
+++ src/platforms/base/integration.cc	2014-03-18 16:39:15 +0000
@@ -88,7 +88,9 @@
 QPlatformOpenGLContext* QUbuntuBaseIntegration::createPlatformOpenGLContext(
     QOpenGLContext* context) {
   DLOG("QUbuntuBaseIntegration::createPlatformOpenGLContext (this=%p, context=%p)", this, context);
-  return new QUbuntuBaseContext(static_cast<QUbuntuBaseScreen*>(context->screen()->handle()));
+  return new QUbuntuBaseContext(
+      static_cast<QUbuntuBaseScreen*>(context->screen()->handle()),
+      static_cast<QUbuntuBaseContext*>(context->shareHandle()));
 }
 
 QStringList QUbuntuBaseIntegration::themeNames() const {