summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2009-01-23 13:18:13 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-23 13:18:13 -0800
commite57e39896049a045751201e912779872026fc741 (patch)
treecda9eee19baa57ca76d19f6fe81a1d8cfb33b8b3
parent216bff5fd4699a694a1d76f91c4ee193c2bbe23a (diff)
intel: fix the mismerge of the vblank pipe enable sanity check
Fix the last merge fix, had the blocks ordered incorrectly.
-rw-r--r--src/mesa/drivers/dri/intel/intel_buffers.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index 3444e2905f..f1a08c5c10 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -166,19 +166,19 @@ intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv)
GLint areaB = driIntersectArea( drw_rect, planeB_rect );
GLuint flags = dPriv->vblFlags;
- /* Do the stupid test: Is one of them actually disabled?
+ /* Update vblank info
*/
- if (sarea->planeA_w == 0 || sarea->planeA_h == 0) {
+ if (areaB > areaA || (areaA == areaB && areaB > 0)) {
flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY;
- } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) {
+ } else {
flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;
}
- /* Update vblank info
+ /* Do the stupid test: Is one of them actually disabled?
*/
- if (areaB > areaA || (areaA == areaB && areaB > 0)) {
+ if (sarea->planeA_w == 0 || sarea->planeA_h == 0) {
flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY;
- } else {
+ } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) {
flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY;
}