r600: prepare for some code sharing

diff --git a/src/mesa/drivers/dri/r600/r600_blit.c b/src/mesa/drivers/dri/r600/r600_blit.c
index 418544a08d79ab47d52a401b0db862e5a886c05c..68324766c3c0bda6466f9e7b2ed4e00cc877957a 100644 (file)
--- 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;
 }
 
     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,
                     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)
 {
                     unsigned h,
                     unsigned flip_y)
 {

+    context_t *context = R700_CONTEXT(ctx);

     int id = 0;
 
     if (!is_blit_supported(dst_mesaformat))
     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 f30c13c288d518f669b3a880a9ff2c97d5ac8b6f..97dc2e57ffac15d07b50c660c90508fbd20a3607 100644 (file)
--- 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,
                     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 287a82ea8f3f1970543a5989d2f81cf12cc7721d..dcea6c06e4baf2a72069434237805fb07f950164 100644 (file)
--- 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 */
 
 
     /* 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,
                      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,