equal
deleted
inserted
replaced
1654 |
1654 |
1655 const QX11Info *xinfo = qt_x11Info(paintDevice); |
1655 const QX11Info *xinfo = qt_x11Info(paintDevice); |
1656 Display *display = xinfo ? xinfo->display() : X11->display; |
1656 Display *display = xinfo ? xinfo->display() : X11->display; |
1657 int screen = xinfo ? xinfo->screen() : X11->defaultScreen; |
1657 int screen = xinfo ? xinfo->screen() : X11->defaultScreen; |
1658 |
1658 |
1659 QGLExtensionMatcher extensions(glXQueryExtensionsString(display, screen)); |
1659 QGLExtensionMatcher serverExtensions(glXQueryExtensionsString(display, screen)); |
1660 if (extensions.match("GLX_EXT_texture_from_pixmap")) { |
1660 QGLExtensionMatcher clientExtensions(glXGetClientString(display, GLX_EXTENSIONS)); |
|
1661 if (serverExtensions.match("GLX_EXT_texture_from_pixmap") |
|
1662 && clientExtensions.match("GLX_EXT_texture_from_pixmap")) |
|
1663 { |
1661 glXBindTexImageEXT = (qt_glXBindTexImageEXT) qglx_getProcAddress("glXBindTexImageEXT"); |
1664 glXBindTexImageEXT = (qt_glXBindTexImageEXT) qglx_getProcAddress("glXBindTexImageEXT"); |
1662 glXReleaseTexImageEXT = (qt_glXReleaseTexImageEXT) qglx_getProcAddress("glXReleaseTexImageEXT"); |
1665 glXReleaseTexImageEXT = (qt_glXReleaseTexImageEXT) qglx_getProcAddress("glXReleaseTexImageEXT"); |
1663 } |
1666 } |
1664 } |
1667 } |
1665 |
1668 |