xmesa: drop unused XMesaPutImageHelper.

It could only be called from XMesaCopySubBuffer but this function is not used
by XFree86.

It seems that XMesaPutImageHelper would handle sub-images but never got
finished. Proper sub-image helpers should be written if need be.

diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h
index c84ffe8a20f27a7b5d71e19ad16dd70c93a44e62..7d5a7c5e995f288c7393f290a71572636cfa404a 100644 (file)
--- a/include/GL/xmesa_xf86.h
+++ b/include/GL/xmesa_xf86.h
@@ -124,8 +124,7 @@ do { \
 do { \
     /* Assumes: Images are always in ZPixmap format */ \
     (void) __d; \
-    if (__sx || __sy) /* The non-trivial case */ \
-       XMesaPutImageHelper(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h); \
+    ASSERT(!__sx && !__sy) /* The SubImage case */ \
     ValidateGC(__b, __gc); \
     (*__gc->ops->PutImage)(__b, __gc, ((XMesaDrawable)(__b))->depth, \
                           __x, __y, __w, __h, 0, ZPixmap, \

diff --git a/src/mesa/drivers/x11/xm_image.c b/src/mesa/drivers/x11/xm_image.c
index b91d5679f9b8310395e4625891b3cbad121f5f7e..087b4e4c3a7c81f02c4049c625ce981cde94eb76 100644 (file)
--- a/src/mesa/drivers/x11/xm_image.c
+++ b/src/mesa/drivers/x11/xm_image.c
@@ -130,21 +130,4 @@ void XMesaPutPixel(XMesaImage *image, int x, int y, unsigned long pixel)
 }
 #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 */

diff --git a/src/mesa/drivers/x11/xm_image.h b/src/mesa/drivers/x11/xm_image.h
index c91ab3935ebffd81f086dc5e5879295a0617e21a..240ccee1af53d29c53068a194edcc63e6a691dc6 100644 (file)
--- a/src/mesa/drivers/x11/xm_image.h
+++ b/src/mesa/drivers/x11/xm_image.h
@@ -81,11 +81,4 @@ extern void XMesaPutPixel(XMesaImage *image, int x, int y,
                          unsigned long pixel);
 #endif
 
-extern 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);
-
 #endif /* _XM_IMAGE_H_ */