diff options
author | Ben Skeggs <[email protected]> | 2008-09-12 20:33:59 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-09-12 20:33:59 +1000 |
commit | 81335d0f1760fe172a106f79e81281c1f0d7dedf (patch) | |
tree | f081924b0dad0fdfb1fa94580d63a88498469909 /src/glut/glx/glut_event.c | |
parent | f302fca5eb63e4bca8af5b35c585451486143e6a (diff) | |
parent | aa66f08a21b791f338b519f0c2162cd8f7b3aeb0 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/glut/glx/glut_event.c')
-rw-r--r-- | src/glut/glx/glut_event.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c index 4e67da674ed..443f9a85740 100644 --- a/src/glut/glx/glut_event.c +++ b/src/glut/glx/glut_event.c @@ -1317,7 +1317,12 @@ processWindowWorkList(GLUTwindow * window) is where the finish works gets queued for indirect contexts. */ __glutSetWindow(window); - glFinish(); +#if !defined(_WIN32) + if (!window->isDirect) +#endif + { + glFinish(); + } } if (workMask & GLUT_DEBUG_WORK) { __glutSetWindow(window); |