equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtOpenGL module of the Qt Toolkit. |
7 ** This file is part of the QtOpenGL module of the Qt Toolkit. |
8 ** |
8 ** |
179 int attribs[40]; |
179 int attribs[40]; |
180 int num_configs = 0; |
180 int num_configs = 0; |
181 |
181 |
182 qt_format_to_attrib_list(f, attribs); |
182 qt_format_to_attrib_list(f, attribs); |
183 |
183 |
184 GLXFBConfig *configs = glXChooseFBConfig(X11->display, X11->defaultScreen, attribs, &num_configs); |
184 int screen = X11->defaultScreen; |
|
185 if (shareWidget) |
|
186 screen = shareWidget->x11Info().screen(); |
|
187 |
|
188 GLXFBConfig *configs = glXChooseFBConfig(X11->display, screen, attribs, &num_configs); |
185 if (configs && num_configs) { |
189 if (configs && num_configs) { |
186 int res; |
190 int res; |
187 glXGetFBConfigAttrib(X11->display, configs[0], GLX_LEVEL, &res); |
191 glXGetFBConfigAttrib(X11->display, configs[0], GLX_LEVEL, &res); |
188 format.setPlane(res); |
192 format.setPlane(res); |
189 glXGetFBConfigAttrib(X11->display, configs[0], GLX_DOUBLEBUFFER, &res); |
193 glXGetFBConfigAttrib(X11->display, configs[0], GLX_DOUBLEBUFFER, &res); |