diff options
| author | Maciej Cencora <[email protected]> | 2010-01-18 22:50:06 +0100 |
|---|---|---|
| committer | Maciej Cencora <[email protected]> | 2010-01-19 23:38:34 +0100 |
| commit | ac8afd401fa5840cf726184329dac75197a50c2e (patch) | |
| tree | c2da9014e7c28505f3e689c14cadd5b3e7db5fe4 | |
| parent | f54e96c5976f0997dd3163ef027a44a3d79c43e2 (diff) | |
r600: prepare for some code sharing
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_blit.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_blit.h | 2 | ||||
| -rw-r--r-- | 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 418544a08d7..68324766c3c 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 f30c13c288d..97dc2e57ffa 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 287a82ea8f3..dcea6c06e4b 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, |