diff options
| author | Jesse Barnes <[email protected]> | 2009-01-23 13:13:23 -0800 |
|---|---|---|
| committer | Jesse Barnes <[email protected]> | 2009-01-23 13:13:23 -0800 |
| commit | 216bff5fd4699a694a1d76f91c4ee193c2bbe23a (patch) | |
| tree | 3d562bf745f541f6cb02d9044fb86f917f474033 | |
| parent | 0b5266ff648b03b3f2beda9838598abc00c4f7b2 (diff) | |
intel: move pipe enable sanity check to where it belongs
Bah, applied the patches in the wrong order, not Owain's fault...
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_buffers.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c index 81e718bb3d6..3444e2905f6 100644 --- a/src/mesa/drivers/dri/intel/intel_buffers.c +++ b/src/mesa/drivers/dri/intel/intel_buffers.c @@ -166,6 +166,14 @@ 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? + */ + if (sarea->planeA_w == 0 || sarea->planeA_h == 0) { + flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY; + } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) { + flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY; + } + /* Update vblank info */ if (areaB > areaA || (areaA == areaB && areaB > 0)) { @@ -195,14 +203,6 @@ intelWindowMoved(struct intel_context *intel) intel->intelScreen->driScrnPriv->ddx_version.minor >= 7) { GLuint flags = intelFixupVblank(intel, dPriv); - /* Do the stupid test: Is one of them actually disabled? - */ - if (sarea->planeA_w == 0 || sarea->planeA_h == 0) { - flags = dPriv->vblFlags | VBLANK_FLAG_SECONDARY; - } else if (sarea->planeB_w == 0 || sarea->planeB_h == 0) { - flags = dPriv->vblFlags & ~VBLANK_FLAG_SECONDARY; - } - /* Check to see if we changed pipes */ if (flags != dPriv->vblFlags && dPriv->vblFlags && !(dPriv->vblFlags & VBLANK_FLAG_NO_IRQ)) { |