i965: Avoid register coalescing away MATH workarounds on Ivybridge.

[mesa.git] / src / mesa / drivers / x11 / xm_image.c

diff --git a/src/mesa/drivers/x11/xm_image.c b/src/mesa/drivers/x11/xm_image.c
index b91d5679f9b8310395e4625891b3cbad121f5f7e..12fef7dad345cecb9e8374fae58a0a979fcdf440 100644 (file)
--- a/src/mesa/drivers/x11/xm_image.c
+++ b/src/mesa/drivers/x11/xm_image.c
@@ -37,114 +37,3 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "glxheader.h"
 #include "xmesaP.h"
 
-#ifdef XFree86Server
-
-#ifdef ROUNDUP
-#undef ROUNDUP
-#endif
-
-#define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3))
-
-XMesaImage *XMesaCreateImage(int bitsPerPixel, int width, int height, char *data)
-{
-    XMesaImage *image;
-
-    image = (XMesaImage *)xalloc(sizeof(XMesaImage));
-
-    if (image) {
-       image->width = width;
-       image->height = height;
-       image->data = data;
-       /* Always pad to 32 bits */
-       image->bytes_per_line = ROUNDUP((bitsPerPixel * width), 32);
-       image->bits_per_pixel = bitsPerPixel;
-    }
-
-    return image;
-}
-
-void XMesaDestroyImage(XMesaImage *image)
-{
-    if (image->data)
-       free(image->data);
-    xfree(image);
-}
-
-unsigned long XMesaGetPixel(XMesaImage *image, int x, int y)
-{
-    CARD8  *row = (CARD8 *)(image->data + y*image->bytes_per_line);
-    CARD8  *i8;
-    CARD16 *i16;
-    CARD32 *i32;
-    switch (image->bits_per_pixel) {
-    case 8:
-       i8 = (CARD8 *)row;
-       return i8[x];
-       break;
-    case 15:
-    case 16:
-       i16 = (CARD16 *)row;
-       return i16[x];
-       break;
-    case 24: /* WARNING: architecture specific code */
-       i8 = (CARD8 *)row;
-       return (((CARD32)i8[x*3]) |
-               (((CARD32)i8[x*3+1])<<8) |
-               (((CARD32)i8[x*3+2])<<16));
-       break;
-    case 32:
-       i32 = (CARD32 *)row;
-       return i32[x];
-       break;
-    }
-    return 0;
-}
-
-#ifndef XMESA_USE_PUTPIXEL_MACRO
-void XMesaPutPixel(XMesaImage *image, int x, int y, unsigned long pixel)
-{
-    CARD8  *row = (CARD8 *)(image->data + y*image->bytes_per_line);
-    CARD8  *i8;
-    CARD16 *i16;
-    CARD32 *i32;
-    switch (image->bits_per_pixel) {
-    case 8:
-       i8 = (CARD8 *)row;
-       i8[x] = (CARD8)pixel;
-       break;
-    case 15:
-    case 16:
-       i16 = (CARD16 *)row;
-       i16[x] = (CARD16)pixel;
-       break;
-    case 24: /* WARNING: architecture specific code */
-       i8 = (CARD8 *)__row;
-       i8[x*3]   = (CARD8)(p);
-       i8[x*3+1] = (CARD8)(p>>8);
-       i8[x*3+2] = (CARD8)(p>>16);
-    case 32:
-       i32 = (CARD32 *)row;
-       i32[x] = (CARD32)pixel;
-       break;
-    }
-}
-#endif
-
-void XMesaPutImageHelper(ScreenPtr display,
-                        DrawablePtr d, GCPtr gc,
-                        XMesaImage *image,
-                        int src_x, int src_y,
-                        int dest_x, int dest_y,
-                        unsigned int width, unsigned int height)
-{
-    /* NOT_DONE: Verify that the following works for all depths */
-    char *src = (image->data +
-                src_y * image->bytes_per_line +
-                ((src_x * image->bits_per_pixel) >> 3));
-
-    ValidateGC(d, gc);
-    (*gc->ops->PutImage)(d, gc, d->depth, dest_x, dest_y, width, height,
-                        0, ZPixmap, src);
-}
-
-#endif /* XFree86Server */