diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-09-11 17:32:18 +0100 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-09-11 17:32:18 +0100 |
commit | 47ad296a183929c2007c35c60d722b4ac680417d (patch) | |
tree | 62bcc7af01606d32d7f137ccf8f342c9b0a6774a /src/glx/x11/glxcmds.c | |
parent | b6458225039ef4cf5c91080e7547ed73fb264c46 (diff) | |
parent | 4d42c5bebf8740ebfc15571d24b6c92f79e09263 (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/glx/x11/glxcmds.c')
-rw-r--r-- | src/glx/x11/glxcmds.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index cd9605cdff..bdcbd25310 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -854,7 +854,8 @@ PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, NULL); if (pdraw != NULL) { - (*pdraw->psc->core->swapBuffers)(pdraw->driDrawable); + glFlush(); + (*pdraw->psc->driScreen->swapBuffers)(pdraw); return; } #endif |