diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-11 16:10:25 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-11 16:18:50 +0000 |
| commit | d35ecca5ee231c072687578642e0c22c6c0590b1 (patch) | |
| tree | 18059c07c64142ebf5dd7b1b674e9426418f3f6b /src/gallium/drivers/softpipe/sp_texture.c | |
| parent | b43c182f19c6291c88420fa12714f952c2b461fb (diff) | |
gallium: remove pipe_context member from pipe_transfer
There was very little use for this beyond permitting the
pipe_context::tex_transfer_destroy() function to omit the pipe_context
argument.
This change adds the pipe_context argument into tex_transfer_destroy()
so that it looks like other pipe_context functions, and removes the
pipe_context pointer from pipe_transfer.
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_texture.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c index adae48c474..da8529c154 100644 --- a/src/gallium/drivers/softpipe/sp_texture.c +++ b/src/gallium/drivers/softpipe/sp_texture.c @@ -277,7 +277,6 @@ softpipe_get_tex_transfer(struct pipe_context *pipe, struct pipe_transfer *pt = &spt->base; int nblocksy = util_format_get_nblocksy(texture->format, u_minify(texture->height0, level)); pipe_texture_reference(&pt->texture, texture); - pt->pipe = pipe; pt->x = x; pt->y = y; pt->width = w; @@ -311,7 +310,8 @@ softpipe_get_tex_transfer(struct pipe_context *pipe, * softpipe_get_tex_transfer(). */ static void -softpipe_tex_transfer_destroy(struct pipe_transfer *transfer) +softpipe_tex_transfer_destroy(struct pipe_context *pipe, + struct pipe_transfer *transfer) { /* Effectively do the texture_update work here - if texture images * needed post-processing to put them into hardware layout, this is |