diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-15 16:50:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-15 16:50:35 +0200 |
| commit | 54db46582aba2252d544fa3956522f9ef06b49cb (patch) | |
| tree | e3692fa2c3864c2bd13089d80bbaccb86b5d4825 /mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c | |
| parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
| download | vcxsrv-54db46582aba2252d544fa3956522f9ef06b49cb.tar.gz vcxsrv-54db46582aba2252d544fa3956522f9ef06b49cb.tar.bz2 vcxsrv-54db46582aba2252d544fa3956522f9ef06b49cb.zip | |
xserver mesa pixman git update 15 oct 2012
xserver: a69429a17bf4630f6e26f61630a1c2b287202627
pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1
mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c index 8d2317ea1..b612f7846 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c @@ -101,10 +101,9 @@ load_color_map_texture(struct gl_context *ctx, struct pipe_resource *pt) uint *dest; uint i, j; - transfer = pipe_get_transfer(pipe, - pt, 0, 0, PIPE_TRANSFER_WRITE, - 0, 0, texSize, texSize); - dest = (uint *) pipe_transfer_map(pipe, transfer); + dest = (uint *) pipe_transfer_map(pipe, + pt, 0, 0, PIPE_TRANSFER_WRITE, + 0, 0, texSize, texSize, &transfer); /* Pack four 1D maps into a 2D texture: * R map is placed horizontally, indexed by S, in channel 0 @@ -127,7 +126,6 @@ load_color_map_texture(struct gl_context *ctx, struct pipe_resource *pt) } pipe_transfer_unmap(pipe, transfer); - pipe->transfer_destroy(pipe, transfer); } |