glamor: Fix some screen_xy offsets to be the right way around.

glamor/glamor_putimage.c

@@ -111,7 +111,7 @@ glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
 	    continue;
 
 	src = bits + (y1 - y) * src_stride + (x1 - x) * (bpp / 8);
-	glRasterPos2i(x1 + pixmap->screen_x, y1 + pixmap->screen_y);
+	glRasterPos2i(x1 - pixmap->screen_x, y1 - pixmap->screen_y);
 	glDrawPixels(x2 - x1,
 		     y2 - y1,
 		     format, type,

glamor/glamor_tile.c

@@ -92,10 +92,10 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
     int x2 = x + width;
     int y1 = y;
     int y2 = y + height;
-    int tile_x1 = tile_x + tile->screen_x;
-    int tile_x2 = tile_x + tile->screen_x + width;
-    int tile_y1 = tile_y + tile->screen_y;
-    int tile_y2 = tile_y + tile->screen_y + height;
+    int tile_x1 = tile_x - tile->screen_x;
+    int tile_x2 = tile_x - tile->screen_x + width;
+    int tile_y1 = tile_y - tile->screen_y;
+    int tile_y2 = tile_y - tile->screen_y + height;
     glamor_pixmap_private *tile_priv = glamor_get_pixmap_private(tile);
 
     if (glamor_priv->tile_prog == 0) {
@@ -121,9 +121,6 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glEnable(GL_TEXTURE_2D);
 
-    tile_x += tile->screen_x;
-    tile_y += tile->screen_y;
-
     glBegin(GL_TRIANGLE_FAN);
     glMultiTexCoord2f(0, tile_x1, tile_y1);
     glVertex2f(x1, y1);