mesa: Branch 'master'

[Brian Paul]

 src/mesa/drivers/dri/mga/mga_xmesa.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 6f652c89d719f537425a8bd6f7e7909966a89a98 (from 7439a36785b6a2783e80a40a96c09db8f56dc2bc)
Author: Gustavo Pichorim Boiko <boiko at mandriva.com>
Date:   Fri Mar 30 14:10:10 2007 -0600

    call DRI_VALIDATE_DRAWABLE_INFO(), bug 10477

diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index ca2c8fa..5b65d1a 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -910,6 +910,7 @@ void mgaGetLock( mgaContextPtr mmesa, GL
 
    drmGetLock(mmesa->driFd, mmesa->hHWContext, flags);
 
+   DRI_VALIDATE_DRAWABLE_INFO( mmesa->driScreen, dPriv );
    if (*(dPriv->pStamp) != mmesa->lastStamp) {
       mmesa->lastStamp = *(dPriv->pStamp);
       mmesa->SetupNewInputs |= VERT_BIT_POS;
@@ -920,7 +921,7 @@ void mgaGetLock( mgaContextPtr mmesa, GL
 
    mmesa->dirty |= MGA_UPLOAD_CONTEXT | MGA_UPLOAD_CLIPRECTS;
 
-    mmesa->sarea->dirty |= MGA_UPLOAD_CONTEXT;
+   mmesa->sarea->dirty |= MGA_UPLOAD_CONTEXT;
 
    if (sarea->ctxOwner != me) {
       mmesa->dirty |= (MGA_UPLOAD_CONTEXT | MGA_UPLOAD_TEX0 |