From b3bb1e3ebf260f18a2097a9a8fe8ab52f104dab1 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 26 Sep 2007 17:03:40 -0600
Subject: [PATCH] s/_mesa_copy_rect/copy_rect/

---
 src/mesa/pipe/softpipe/sp_region.c | 51 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/mesa/pipe/softpipe/sp_region.c b/src/mesa/pipe/softpipe/sp_region.c
index 697b738e437..faf2737d6bb 100644
--- a/src/mesa/pipe/softpipe/sp_region.c
+++ b/src/mesa/pipe/softpipe/sp_region.c
@@ -123,21 +123,22 @@ sp_region_release(struct pipe_context *pipe, struct pipe_region **region)
 }
 
 
-/*
- * XXX Move this into core Mesa?
+/**
+ * Copy 2D rect from one place to another.
+ * Position and sizes are in pixels.
  */
 static void
-_mesa_copy_rect(ubyte * dst,
-                unsigned cpp,
-                unsigned dst_pitch,
-                unsigned dst_x,
-                unsigned dst_y,
-                unsigned width,
-                unsigned height,
-                const ubyte * src,
-                unsigned src_pitch,
-		unsigned src_x, 
-		unsigned src_y)
+copy_rect(ubyte * dst,
+          unsigned cpp,
+          unsigned dst_pitch,
+          unsigned dst_x,
+          unsigned dst_y,
+          unsigned width,
+          unsigned height,
+          const ubyte * src,
+          unsigned src_pitch,
+          unsigned src_x, 
+          unsigned src_y)
 {
    unsigned i;
 
@@ -176,10 +177,10 @@ sp_region_data(struct pipe_context *pipe,
 	       const void *src, unsigned src_pitch,
 	       unsigned srcx, unsigned srcy, unsigned width, unsigned height)
 {
-   _mesa_copy_rect(pipe->region_map(pipe, dst) + dst_offset,
-                   dst->cpp,
-                   dst->pitch,
-                   dstx, dsty, width, height, src, src_pitch, srcx, srcy);
+   copy_rect(pipe->region_map(pipe, dst) + dst_offset,
+             dst->cpp,
+             dst->pitch,
+             dstx, dsty, width, height, src, src_pitch, srcx, srcy);
 
    pipe->region_unmap(pipe, dst);
 }
@@ -198,14 +199,14 @@ sp_region_copy(struct pipe_context *pipe,
 {
    assert( dst->cpp == src->cpp );
 
-   _mesa_copy_rect(pipe->region_map(pipe, dst) + dst_offset,
-                   dst->cpp,
-                   dst->pitch,
-                   dstx, dsty, 
-		   width, height, 
-		   pipe->region_map(pipe, src) + src_offset, 
-		   src->pitch, 
-		   srcx, srcy);
+   copy_rect(pipe->region_map(pipe, dst) + dst_offset,
+             dst->cpp,
+             dst->pitch,
+             dstx, dsty, 
+             width, height, 
+             pipe->region_map(pipe, src) + src_offset, 
+             src->pitch, 
+             srcx, srcy);
 
    pipe->region_unmap(pipe, src);
    pipe->region_unmap(pipe, dst);
-- 
2.30.2