Mesa (master): r600: prepare for some code sharing

[Maciej Cencora]

Module: Mesa
Branch: master
Commit: ac8afd401fa5840cf726184329dac75197a50c2e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac8afd401fa5840cf726184329dac75197a50c2e

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Mon Jan 18 22:50:06 2010 +0100

r600: prepare for some code sharing

---

 src/mesa/drivers/dri/r600/r600_blit.c    |    3 ++-
 src/mesa/drivers/dri/r600/r600_blit.h    |    2 +-
 src/mesa/drivers/dri/r600/r600_texcopy.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_blit.c b/src/mesa/drivers/dri/r600/r600_blit.c
index 418544a..6832476 100644
--- a/src/mesa/drivers/dri/r600/r600_blit.c
+++ b/src/mesa/drivers/dri/r600/r600_blit.c
@@ -1559,7 +1559,7 @@ static GLboolean validate_buffers(context_t *rmesa,
     return GL_TRUE;
 }
 
-GLboolean r600_blit(context_t *context,
+GLboolean r600_blit(GLcontext *ctx,
                     struct radeon_bo *src_bo,
                     intptr_t src_offset,
                     gl_format src_mesaformat,
@@ -1580,6 +1580,7 @@ GLboolean r600_blit(context_t *context,
                     unsigned h,
                     unsigned flip_y)
 {
+    context_t *context = R700_CONTEXT(ctx);
     int id = 0;
 
     if (!is_blit_supported(dst_mesaformat))
diff --git a/src/mesa/drivers/dri/r600/r600_blit.h b/src/mesa/drivers/dri/r600/r600_blit.h
index f30c13c..97dc2e5 100644
--- a/src/mesa/drivers/dri/r600/r600_blit.h
+++ b/src/mesa/drivers/dri/r600/r600_blit.h
@@ -1,4 +1,4 @@
-GLboolean r600_blit(context_t *context,
+GLboolean r600_blit(GLcontext *ctx,
                     struct radeon_bo *src_bo,
                     intptr_t src_offset,
                     gl_format src_mesaformat,
diff --git a/src/mesa/drivers/dri/r600/r600_texcopy.c b/src/mesa/drivers/dri/r600/r600_texcopy.c
index 287a82e..dcea6c0 100644
--- a/src/mesa/drivers/dri/r600/r600_texcopy.c
+++ b/src/mesa/drivers/dri/r600/r600_texcopy.c
@@ -85,7 +85,7 @@ do_copy_texsubimage(GLcontext *ctx,
 
 
     /* blit from src buffer to texture */
-    return r600_blit(context, rrb->bo, src_offset, rrb->base.Format, rrb->pitch,
+    return r600_blit(ctx, rrb->bo, src_offset, rrb->base.Format, rrb->pitch,
                      rrb->base.Width, rrb->base.Height, x, y,
                      timg->mt->bo, dst_offset, timg->base.TexFormat,
                      timg->mt->levels[level].rowstride, timg->base.Width, timg->base.Height,