diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-01-23 13:18:13 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-03-13 17:38:36 -0700 |
| commit | 75ecd6ebbf2cea55ec00bd02f2715a7d1d6ce99f (patch) | |
| tree | 955f3a726a8e4beabc9447c85f4ad2f042d9b813 | |
| parent | 1cd7317fdbae3fd61e6ee1b1c929be142ef59996 (diff) | |
intel: fix the mismerge of the vblank pipe enable sanity check
Fix the last merge fix, had the blocks ordered incorrectly.
(cherry picked from commit e57e39896049a045751201e912779872026fc741)
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffers.c | 12 |
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 3f572faca2f..5ec5bf1fc22 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; } |