diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-03-04 15:23:35 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-03-04 15:23:35 +0000 |
| commit | 5b04939b16eb6e13858b070315dee1d0fc09d94f (patch) | |
| tree | 0f8739ea6fa7219eaebbb9ff090f86713ef820e0 /src/gallium/drivers/nv20/nv20_transfer.c | |
| parent | cfd5298f240612ef69ae321aebbc425710a8d731 (diff) | |
| parent | f9ce417aaf14c00e72e92307b910de5dbed1bb6d (diff) | |
Merge commit 'origin/master' into gallium-map-range
Diffstat (limited to 'src/gallium/drivers/nv20/nv20_transfer.c')
| -rw-r--r-- | src/gallium/drivers/nv20/nv20_transfer.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/drivers/nv20/nv20_transfer.c b/src/gallium/drivers/nv20/nv20_transfer.c index 1631637067..e5255296aa 100644 --- a/src/gallium/drivers/nv20/nv20_transfer.c +++ b/src/gallium/drivers/nv20/nv20_transfer.c @@ -64,7 +64,6 @@ nv20_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt, if (!tx) return NULL; - tx->base.refcount = 1; pipe_texture_reference(&tx->base.texture, pt); tx->base.format = pt->format; tx->base.x = x; @@ -138,12 +137,12 @@ nv20_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt, } static void -nv20_transfer_del(struct pipe_screen *pscreen, struct pipe_transfer **pptx) +nv20_transfer_del(struct pipe_transfer *ptx) { - struct pipe_transfer *ptx = *pptx; struct nv20_transfer *tx = (struct nv20_transfer *)ptx; if (!tx->direct && ptx->usage != PIPE_TRANSFER_READ) { + struct pipe_screen *pscreen = ptx->texture->screen; struct nv20_screen *nvscreen = nv20_screen(pscreen); struct pipe_surface *dst; @@ -160,10 +159,6 @@ nv20_transfer_del(struct pipe_screen *pscreen, struct pipe_transfer **pptx) pipe_surface_reference(&dst, NULL); } - *pptx = NULL; - if (--ptx->refcount) - return; - pipe_surface_reference(&tx->surface, NULL); pipe_texture_reference(&ptx->texture, NULL); FREE(ptx); @@ -195,7 +190,7 @@ void nv20_screen_init_transfer_functions(struct pipe_screen *pscreen) { pscreen->get_tex_transfer = nv20_transfer_new; - pscreen->tex_transfer_release = nv20_transfer_del; + pscreen->tex_transfer_destroy = nv20_transfer_del; pscreen->transfer_map = nv20_transfer_map; pscreen->transfer_unmap = nv20_transfer_unmap; } |