diff options
| author | Brian Paul <brianp@vmware.com> | 2008-12-30 18:01:15 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2008-12-30 18:01:15 -0700 |
| commit | c789bd376f09c3b61617aeef6f5adbba2c541178 (patch) | |
| tree | b50aba807e609ef6084e52d814370a2cc761f1c8 /src/mesa/drivers/dri/intel/intel_buffers.c | |
| parent | 369115e4c7a2985d880951fd8248deefa92025dd (diff) | |
| parent | e8d7db31e2a6784c765911233cb3d888f612837f (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/main/config.h
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_buffers.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c index f8f009c6a3..4d036dee42 100644 --- a/src/mesa/drivers/dri/intel/intel_buffers.c +++ b/src/mesa/drivers/dri/intel/intel_buffers.c @@ -181,7 +181,7 @@ intelUpdatePageFlipping(struct intel_context *intel, intel_fb->pf_current_page = (intel->sarea->pf_current_page >> (intel_fb->pf_planes & 0x2)) & 0x3; - intel_fb->pf_num_pages = intel->intelScreen->third.handle ? 3 : 2; + intel_fb->pf_num_pages = 2; pf_active = pf_planes && (pf_planes & intel->sarea->pf_active) == pf_planes; |