diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c index e706e0fb4..842114235 100644 --- a/glamor/glamor_transfer.c +++ b/glamor/glamor_transfer.c @@ -107,22 +107,6 @@ glamor_upload_region(PixmapPtr pixmap, RegionPtr region, bits, byte_stride); } -/* - * Take the data in the pixmap and stuff it back into the FBO - */ -void -glamor_upload_pixmap(PixmapPtr pixmap) -{ - BoxRec box; - - box.x1 = 0; - box.x2 = pixmap->drawable.width; - box.y1 = 0; - box.y2 = pixmap->drawable.height; - glamor_upload_boxes(pixmap, &box, 1, 0, 0, 0, 0, - pixmap->devPrivate.ptr, pixmap->devKind); -} - /* * Read stuff from the pixmap FBOs and write to memory */ @@ -182,37 +166,3 @@ glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox, if (glamor_priv->has_pack_subimage) glPixelStorei(GL_PACK_ROW_LENGTH, 0); } - -/* - * Read data from the pixmap FBO - */ -void -glamor_download_rect(PixmapPtr pixmap, int x, int y, int w, int h, uint8_t *bits) -{ - BoxRec box; - - box.x1 = x; - box.x2 = x + w; - box.y1 = y; - box.y2 = y + h; - - glamor_download_boxes(pixmap, &box, 1, 0, 0, -x, -y, - bits, PixmapBytePad(w, pixmap->drawable.depth)); -} - -/* - * Pull the data from the FBO down to the pixmap - */ -void -glamor_download_pixmap(PixmapPtr pixmap) -{ - BoxRec box; - - box.x1 = 0; - box.x2 = pixmap->drawable.width; - box.y1 = 0; - box.y2 = pixmap->drawable.height; - - glamor_download_boxes(pixmap, &box, 1, 0, 0, 0, 0, - pixmap->devPrivate.ptr, pixmap->devKind); -} diff --git a/glamor/glamor_transfer.h b/glamor/glamor_transfer.h index a6137b3ff..26b5a6b0d 100644 --- a/glamor/glamor_transfer.h +++ b/glamor/glamor_transfer.h @@ -34,19 +34,10 @@ glamor_upload_region(PixmapPtr pixmap, RegionPtr region, int region_x, int region_y, uint8_t *bits, uint32_t byte_stride); -void -glamor_upload_pixmap(PixmapPtr pixmap); - void glamor_download_boxes(PixmapPtr pixmap, BoxPtr in_boxes, int in_nbox, int dx_src, int dy_src, int dx_dst, int dy_dst, uint8_t *bits, uint32_t byte_stride); -void -glamor_download_rect(PixmapPtr pixmap, int x, int y, int w, int h, uint8_t *bits); - -void -glamor_download_pixmap(PixmapPtr pixmap); - #endif /* _GLAMOR_TRANSFER_H_ */