diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /src/glut/glx/glut_event.c | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/glut/glx/glut_event.c')
| -rw-r--r-- | src/glut/glx/glut_event.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c index b5df7b2311..d6d963896a 100644 --- a/src/glut/glx/glut_event.c +++ b/src/glut/glx/glut_event.c @@ -1321,7 +1321,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); @@ -1338,9 +1343,7 @@ processWindowWorkList(GLUTwindow * window) } } -#ifndef _WIN32 static /* X11 implementations do not need this global. */ -#endif void __glutProcessWindowWorkLists(void) { |