diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-10-08 04:06:42 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-10-11 21:12:16 +0200 |
| commit | 369e46888904c6d379b8b477d9242cff1608e30e (patch) | |
| tree | 528b10f900f23af3acd22a0edcf50fde0eeee86e /src/gallium/state_trackers/dri/sw/drisw.c | |
| parent | ec4c74a9dc10039d97ad24c4f16bd2400517991d (diff) | |
| download | external_mesa3d-369e46888904c6d379b8b477d9242cff1608e30e.zip external_mesa3d-369e46888904c6d379b8b477d9242cff1608e30e.tar.gz external_mesa3d-369e46888904c6d379b8b477d9242cff1608e30e.tar.bz2 | |
gallium: unify transfer functions
"get_transfer + transfer_map" becomes "transfer_map".
"transfer_unmap + transfer_destroy" becomes "transfer_unmap".
transfer_map must create and return the transfer object and transfer_unmap
must destroy it.
transfer_map is successful if the returned buffer pointer is not NULL.
If transfer_map fails, the pointer to the transfer object remains unchanged
(i.e. doesn't have to be NULL).
Acked-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/state_trackers/dri/sw/drisw.c')
| -rw-r--r-- | src/gallium/state_trackers/dri/sw/drisw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c index c4c4264..5247126 100644 --- a/src/gallium/state_trackers/dri/sw/drisw.c +++ b/src/gallium/state_trackers/dri/sw/drisw.c @@ -257,11 +257,10 @@ drisw_update_tex_buffer(struct dri_drawable *drawable, get_drawable_info(dPriv, &x, &y, &w, &h); - transfer = pipe_get_transfer(pipe, res, - 0, 0, // level, layer, - PIPE_TRANSFER_WRITE, - x, y, w, h); - map = pipe_transfer_map(pipe, transfer); + map = pipe_transfer_map(pipe, res, + 0, 0, // level, layer, + PIPE_TRANSFER_WRITE, + x, y, w, h, &transfer); /* Copy the Drawable content to the mapped texture buffer */ get_image(dPriv, x, y, w, h, map); @@ -275,7 +274,6 @@ drisw_update_tex_buffer(struct dri_drawable *drawable, } pipe_transfer_unmap(pipe, transfer); - pipe_transfer_destroy(pipe, transfer); } /* |