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/auxiliary/draw/draw_pipe_pstipple.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/auxiliary/draw/draw_pipe_pstipple.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pipe_pstipple.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c index 842f6ee..e4c5e73 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c +++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c @@ -396,9 +396,8 @@ pstip_update_texture(struct pstip_stage *pstip) uint i, j; ubyte *data; - transfer = pipe_get_transfer(pipe, pstip->texture, 0, 0, - PIPE_TRANSFER_WRITE, 0, 0, 32, 32); - data = pipe->transfer_map(pipe, transfer); + data = pipe_transfer_map(pipe, pstip->texture, 0, 0, + PIPE_TRANSFER_WRITE, 0, 0, 32, 32, &transfer); /* * Load alpha texture. @@ -421,7 +420,6 @@ pstip_update_texture(struct pstip_stage *pstip) /* unmap */ pipe->transfer_unmap(pipe, transfer); - pipe->transfer_destroy(pipe, transfer); } |