diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-06-11 14:52:55 +0100 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-06-11 14:52:55 +0100 |
commit | 1bcb817167773d6a148dd4b2cd63777d0f072c08 (patch) | |
tree | fea9712a6aff0f880943da6207d11163a6592e7b /src/gallium/winsys/dri/intel/intel_lock.c | |
parent | 4dd1917e4be3ae48b436ed333bd2fcd37603d1ed (diff) |
Hook gallium i915 up to DRI2
Diffstat (limited to 'src/gallium/winsys/dri/intel/intel_lock.c')
-rw-r--r-- | src/gallium/winsys/dri/intel/intel_lock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_lock.c b/src/gallium/winsys/dri/intel/intel_lock.c index 406284c98f..469090c0e1 100644 --- a/src/gallium/winsys/dri/intel/intel_lock.c +++ b/src/gallium/winsys/dri/intel/intel_lock.c @@ -50,6 +50,9 @@ intelContendedLock(struct intel_context *intel, uint flags) DBG(LOCK, "%s - got contended lock\n", __progname); + if (sPriv->dri2.enabled) + return; + /* If the window moved, may need to set a new cliprect now. * * NOTE: This releases and regains the hw lock, so all state @@ -58,8 +61,8 @@ intelContendedLock(struct intel_context *intel, uint flags) if (dPriv) DRI_VALIDATE_DRAWABLE_INFO(sPriv, dPriv); - if (sarea->width != intelScreen->front.width || - sarea->height != intelScreen->front.height) { + if (sarea && (sarea->width != intelScreen->front.width || + sarea->height != intelScreen->front.height)) { intelUpdateScreenRotation(sPriv, sarea); } |