r300: fix some whitespace

[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 6af773f538439deded6efce07c9dc6eab0cbd0b1..087b4e4c3a7c81f02c4049c625ce981cde94eb76 100644 (file)
--- a/src/mesa/drivers/x11/xm_image.c
+++ b/src/mesa/drivers/x11/xm_image.c
@@ -31,15 +31,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Brian Paul <brian@precisioninsight.com>
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <stdlib.h>
-
-#include "xf86glx_util.h"
 #include <X11/Xmd.h>
 
+#include "glxheader.h"
+#include "xmesaP.h"
+
+#ifdef XFree86Server
+
 #ifdef ROUNDUP
 #undef ROUNDUP
 #endif
@@ -131,19 +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 */