Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Dont do doneCurrent in swapBuffers
This commit is contained in:
Qt Continuous Integration System 2011-05-06 04:21:17 +10:00
commit bedc018370

View File

@ -110,7 +110,6 @@ void QGLXContext::swapBuffers()
{ {
Q_XCB_NOOP(m_screen->connection()); Q_XCB_NOOP(m_screen->connection());
glXSwapBuffers(DISPLAY_FROM_XCB(m_screen), m_drawable); glXSwapBuffers(DISPLAY_FROM_XCB(m_screen), m_drawable);
doneCurrent();
Q_XCB_NOOP(m_screen->connection()); Q_XCB_NOOP(m_screen->connection());
} }