Attachment #422510 for bug #571132

Lines 652-658 void QGLXContext::queryDummyContext() Link Here

(-)a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp (-1 / +4 lines)
652	oldSurface = oldContext->surface();	652	oldSurface = oldContext->surface();
653		653
654	QScopedPointer<QSurface> surface;	654	QScopedPointer<QSurface> surface;
655	const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(), GLX_VENDOR);	655	Display *display = glXGetCurrentDisplay();
		656	const char *glxvendor = 0;
		657	if (display)
		658	glxvendor = glXGetClientString(display, GLX_VENDOR);
656	if (glxvendor && !strcmp(glxvendor, "ATI")) {	659	if (glxvendor && !strcmp(glxvendor, "ATI")) {
657	QWindow *window = new QWindow;	660	QWindow *window = new QWindow;
658	window->resize(64, 64);	661	window->resize(64, 64);

Lines 195-201 QPlatformOffscreenSurface *QXcbGlxIntegration::createPlatformOffscreenSurface(QO Link Here

(-)a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp (-2 / +4 lines)
195	static bool glxPbufferUsable = true;	195	static bool glxPbufferUsable = true;
196	if (!vendorChecked) {	196	if (!vendorChecked) {
197	vendorChecked = true;	197	vendorChecked = true;
198	const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(), GLX_VENDOR);	198	Display *display = glXGetCurrentDisplay();
		199	const char *glxvendor = 0;
		200	if (display)
		201	glxvendor = glXGetClientString(display, GLX_VENDOR);
199	if (glxvendor && !strcmp(glxvendor, "ATI"))	202	if (glxvendor && !strcmp(glxvendor, "ATI"))
200	glxPbufferUsable = false;	203	glxPbufferUsable = false;
201	}	204	}
202	-

Return to bug 571132