From 783f218aac7c73837405af4893d8dd35b425a710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Fri, 6 Aug 2010 13:23:06 +0200
Subject: Fixed Lighthouse tempcontext to reset to current context

and made glxintegrations shared context use the correct window
configuration
---
 src/opengl/qgl_qpa.cpp                             | 13 ++++++++-----
 src/plugins/platforms/testlite/qglxintegration.cpp | 17 ++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index b05df64..ad125fe 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -244,20 +244,23 @@ void QGLContext::generateFontDisplayLists(const QFont & fnt, int listBase)
 class QGLTemporaryContextPrivate
 {
 public:
-    QWidget *widget;
+    QGLWidget *widget;
+    QGLContext *context;
 };
 
 QGLTemporaryContext::QGLTemporaryContext(bool, QWidget *)
     : d(new QGLTemporaryContextPrivate)
 {
-    d->widget = new QWidget;
-    d->widget->setGeometry(0,0,3,3);
-    d->widget->winId();
-    d->widget->platformWindow()->glContext()->makeCurrent();
+    d->context = const_cast<QGLContext *>(QGLContext::currentContext());
+    d->context->doneCurrent();
+    d->widget = new QGLWidget;
+    d->widget->makeCurrent();
 }
 
 QGLTemporaryContext::~QGLTemporaryContext()
 {
+    d->widget->doneCurrent();
+    d->context->makeCurrent();
     delete d->widget;
 }
 
diff --git a/src/plugins/platforms/testlite/qglxintegration.cpp b/src/plugins/platforms/testlite/qglxintegration.cpp
index 47a4f5a..050643c 100644
--- a/src/plugins/platforms/testlite/qglxintegration.cpp
+++ b/src/plugins/platforms/testlite/qglxintegration.cpp
@@ -262,20 +262,27 @@ void QGLXGLContext::createDefaultSharedContex(MyDisplay *xd)
     int w = 3;
     int h = 3;
 
-    Window sharedWindow = XCreateSimpleWindow(xd->display, xd->rootWindow(),
-                                   x, y, w, h, 0 /*border_width*/,
-                                   xd->blackPixel(), xd->whitePixel());
-    GLXContext context;
     QPlatformWindowFormat format = QPlatformWindowFormat::defaultFormat();
+    GLXContext context;
     GLXFBConfig config = findConfig(xd,format);
     if (config) {
+        XVisualInfo *visualInfo = glXGetVisualFromFBConfig(xd->display,config);
+        Colormap cmap = XCreateColormap(xd->display,xd->rootWindow(),visualInfo->visual,AllocNone);
+        XSetWindowAttributes a;
+        a.colormap = cmap;
+        Window sharedWindow = XCreateWindow(xd->display, xd->rootWindow(),x, y, w, h,
+                                  0, visualInfo->depth, InputOutput, visualInfo->visual,
+                                  CWColormap, &a);
+
         context = glXCreateNewContext(xd->display,config,GLX_RGBA_TYPE,0,TRUE);
         QPlatformGLContext *sharedContext = new QGLXGLContext(xd,sharedWindow,context);
         QPlatformGLContext::setDefaultSharedContext(sharedContext);
     } else {
-        qFatal("Warning no shared context created");
+        qWarning("Warning no shared context created");
     }
 
+
+
 }
 
 void QGLXGLContext::makeCurrent()
-- 
cgit v0.12