X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnv30%2Fnv30_transfer.c;h=23675718781310c0cc1ee28cc183dd7d1f703154;hb=288299ae12603cf7ab0388db426d764c3f31304e;hp=6367374a61612c2fa54774ed86dd2c052b05cf7e;hpb=916de35d677ca5238e9515840fa5aa9f81302c5b;p=mesa.git

diff --git a/src/gallium/drivers/nv30/nv30_transfer.c b/src/gallium/drivers/nv30/nv30_transfer.c
index 6367374a616..23675718781 100644
--- a/src/gallium/drivers/nv30/nv30_transfer.c
+++ b/src/gallium/drivers/nv30/nv30_transfer.c
@@ -43,7 +43,6 @@ nv30_compatible_transfer_tex(struct pipe_texture *pt, unsigned level,
 	template->nblocksx[0] = pt->nblocksx[level];
 	template->nblocksy[0] = pt->nblocksx[level];
 	template->last_level = 0;
-	template->compressed = pt->compressed;
 	template->nr_samples = pt->nr_samples;
 
 	template->tex_usage = PIPE_TEXTURE_USAGE_DYNAMIC |
@@ -64,7 +63,6 @@ nv30_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 +136,12 @@ nv30_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 }
 
 static void
-nv30_transfer_del(struct pipe_screen *pscreen, struct pipe_transfer **pptx)
+nv30_transfer_del(struct pipe_transfer *ptx)
 {
-	struct pipe_transfer *ptx = *pptx;
 	struct nv30_transfer *tx = (struct nv30_transfer *)ptx;
 
 	if (!tx->direct && ptx->usage != PIPE_TRANSFER_READ) {
+		struct pipe_screen *pscreen = ptx->texture->screen;
 		struct nv30_screen *nvscreen = nv30_screen(pscreen);
 		struct pipe_surface *dst;
 
@@ -160,10 +158,6 @@ nv30_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 +189,7 @@ void
 nv30_screen_init_transfer_functions(struct pipe_screen *pscreen)
 {
 	pscreen->get_tex_transfer = nv30_transfer_new;
-	pscreen->tex_transfer_release = nv30_transfer_del;
+	pscreen->tex_transfer_destroy = nv30_transfer_del;
 	pscreen->transfer_map = nv30_transfer_map;
 	pscreen->transfer_unmap = nv30_transfer_unmap;
 }