diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-06-09 07:53:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-06-09 07:53:25 +0200 |
| commit | ee98ae5a29ca870149c4a0d2a8f25f55e0fd333a (patch) | |
| tree | 308fa87e22a276c0f8f28fd9f0986d20b52be928 /src/gallium/state_trackers | |
| parent | d9617deb008b75f4a605a30408aeb1948139c33e (diff) | |
| parent | 76a1017e978f8e51114d765c8c98ff25da13042b (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/wgl/shared/stw_framebuffer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c index de37d135dfe..a601fc5646b 100644 --- a/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c +++ b/src/gallium/state_trackers/wgl/shared/stw_framebuffer.c @@ -118,7 +118,8 @@ stw_call_window_proc( * be called from any thread. */ pipe_mutex_lock( fb->mutex ); - st_resize_framebuffer( fb->stfb, width, height ); + if (fb->stfb) + st_resize_framebuffer( fb->stfb, width, height ); pipe_mutex_unlock( fb->mutex ); } } @@ -379,6 +380,9 @@ stw_swap_buffers( if (fb == NULL) return FALSE; + if (!(fb->pfi->pfd.dwFlags & PFD_DOUBLEBUFFER)) + return TRUE; + pipe_mutex_lock( fb->mutex ); /* If we're swapping the buffer associated with the current context |