xserver: Branch 'master'

[Kristian Høgsberg]

 GL/glx/glxdri.c |   18 ------------------
 1 files changed, 18 deletions(-)

New commits:
diff-tree 6a195e816b9d60f728d77cc1c23538e7af00a879 (from 03f9da672466b9ab9a9814d784b8c44f1030587e)
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Mon Aug 13 10:43:48 2007 -0400

    Revert "Implement damage tracking for AIGLX."
    
    This reverts commit 2243b30e54df07892f75e3d65b687abe5b183cf3.  The existing
    DRI interface doesn't let us get from a __DRIdrawable to the corresponding
    X drawable, and thus, we can't implement AIGLX damage tracking with the
    current interface.

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index cc1e70b..685683d 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -943,22 +943,6 @@ getUST(int64_t *ust)
     }
 }
 
-static void __glXReportDamage(__DRIdrawable *driDraw,
-			      int x, int y,
-			      drm_clip_rect_t *rects, int num_rects,
-			      GLboolean front_buffer)
-{
-    __GLXDRIdrawable *drawable =
-	    containerOf(driDraw, __GLXDRIdrawable, driDrawable);
-    DrawablePtr pDraw = drawable->base.pDraw;
-    RegionRec region;
-
-    REGION_INIT(pDraw->pScreen, &region, (BoxPtr) rects, num_rects);
-    REGION_TRANSLATE(pScreen, &region, pDraw->x, pDraw->y);
-    DamageDamageRegion(pDraw, &region);
-    REGION_UNINIT(pDraw->pScreen, &region);
-}
-
 /* Table of functions that we export to the driver. */
 static const __DRIinterfaceMethods interface_methods = {
     getProcAddress,
@@ -978,8 +962,6 @@ static const __DRIinterfaceMethods inter
 
     getUST,
     NULL, /* glXGetMscRateOML, */
-
-    __glXReportDamage,
 };
 
 static const char dri_driver_path[] = DRI_DRIVER_PATH;