xserver: Branch 'master'

[Kristian Høgsberg]

 glx/glxdri2.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8ff62ea5ba1bc331c886840b2b1e101cb4f2ebed
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Wed Nov 12 15:19:09 2008 -0500

    CopySubBuffer expects GL style coordinates.

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index c4105e2..4e76c71 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -114,13 +114,14 @@ static void
 __glXDRIdrawableCopySubBuffer(__GLXdrawable *drawable,
 			       int x, int y, int w, int h)
 {
+    __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
     BoxRec box;
     RegionRec region;
 
     box.x1 = x;
-    box.y1 = y;
+    box.y1 = private->height - y - h;
     box.x2 = x + w;
-    box.y2 = y + h;
+    box.y2 = private->height - y;
     REGION_INIT(drawable->pDraw->pScreen, &region, &box, 0);
 
     DRI2CopyRegion(drawable->pDraw, &region,