gallium: Unify reference counting.

The core reference counting code is centralized in p_refcnt.h.

This has some consequences related to struct pipe_buffer:

* The screen member of struct pipe_buffer must be initialized, or
  pipe_buffer_reference() will crash trying to destroy a buffer with reference
  count 0. u_simple_screen takes care of this, but I may have missed some of
  the drivers not using it.
* Except for rare exceptions deep in winsys code, buffers must always be
  allocated via pipe_buffer_create() or via screen->*buffer_create() rather
  than via winsys->*buffer_create().

1 files changed, 3 insertions, 8 deletions

diff --git a/src/gallium/drivers/nv10/nv10_transfer.c b/src/gallium/drivers/nv10/nv10_transfer.c
index daec37ab28e..5a99225409c 100644
--- a/src/gallium/drivers/nv10/nv10_transfer.c
+++ b/src/gallium/drivers/nv10/nv10_transfer.c
@@ -64,7 +64,6 @@ nv10_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 @@ nv10_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 }
 
 static void
-nv10_transfer_del(struct pipe_screen *pscreen, struct pipe_transfer **pptx)
+nv10_transfer_del(struct pipe_transfer *ptx)
 {
-	struct pipe_transfer *ptx = *pptx;
 	struct nv10_transfer *tx = (struct nv10_transfer *)ptx;
 
 	if (!tx->direct && ptx->usage != PIPE_TRANSFER_READ) {
+		struct pipe_screen *pscreen = ptx->texture->screen;
 		struct nv10_screen *nvscreen = nv10_screen(pscreen);
 		struct pipe_surface *dst;
 
@@ -160,10 +159,6 @@ nv10_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
 nv10_screen_init_transfer_functions(struct pipe_screen *pscreen)
 {
 	pscreen->get_tex_transfer = nv10_transfer_new;
-	pscreen->tex_transfer_release = nv10_transfer_del;
+	pscreen->tex_transfer_destroy = nv10_transfer_del;
 	pscreen->transfer_map = nv10_transfer_map;
 	pscreen->transfer_unmap = nv10_transfer_unmap;
 }