Merge commit 'origin/master' into gallium-map-range

3 files changed, 22 insertions, 41 deletions

diff --git a/src/gallium/drivers/nv20/nv20_miptree.c b/src/gallium/drivers/nv20/nv20_miptree.c
index 29462408970..b2f29aff8d2 100644
--- a/src/gallium/drivers/nv20/nv20_miptree.c
+++ b/src/gallium/drivers/nv20/nv20_miptree.c
@@ -76,19 +76,18 @@ nv20_miptree_blanket(struct pipe_screen *pscreen, const struct pipe_texture *pt,
 		return NULL;
 
 	mt->base = *pt;
-	mt->base.refcount = 1;
+	pipe_reference_init(&mt->base.reference, 1);
 	mt->base.screen = pscreen;
 	mt->level[0].pitch = stride[0];
 	mt->level[0].image_offset = CALLOC(1, sizeof(unsigned));
 
-	pipe_buffer_reference(pscreen, &mt->buffer, pb);
+	pipe_buffer_reference(&mt->buffer, pb);
 	return &mt->base;
 }
 
 static struct pipe_texture *
 nv20_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 {
-	struct pipe_winsys *ws = screen->winsys;
 	struct nv20_miptree *mt;
 	unsigned buf_usage = PIPE_BUFFER_USAGE_PIXEL |
 	                     NOUVEAU_BUFFER_USAGE_TEXTURE;
@@ -97,7 +96,7 @@ nv20_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 	if (!mt)
 		return NULL;
 	mt->base = *pt;
-	mt->base.refcount = 1;
+	pipe_reference_init(&mt->base.reference, 1);
 	mt->base.screen = screen;
 
 	/* Swizzled textures must be POT */
@@ -133,7 +132,7 @@ nv20_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 
 	nv20_miptree_layout(mt);
 
-	mt->buffer = ws->buffer_create(ws, 256, buf_usage, mt->total_size);
+	mt->buffer = screen->buffer_create(screen, 256, buf_usage, mt->total_size);
 	if (!mt->buffer) {
 		FREE(mt);
 		return NULL;
@@ -143,22 +142,16 @@ nv20_miptree_create(struct pipe_screen *screen, const struct pipe_texture *pt)
 }
 
 static void
-nv20_miptree_release(struct pipe_screen *screen, struct pipe_texture **pt)
+nv20_miptree_destroy(struct pipe_texture *pt)
 {
-	struct pipe_texture *mt = *pt;
-
-	*pt = NULL;
-	if (--mt->refcount <= 0) {
-		struct nv20_miptree *nv20mt = (struct nv20_miptree *)mt;
-		int l;
+	struct nv20_miptree *nv20mt = (struct nv20_miptree *)pt;
+        int l;
 
-		pipe_buffer_reference(screen, &nv20mt->buffer, NULL);
-		for (l = 0; l <= mt->last_level; l++) {
-			if (nv20mt->level[l].image_offset)
-				FREE(nv20mt->level[l].image_offset);
-		}
-		FREE(nv20mt);
-	}
+        pipe_buffer_reference(&nv20mt->buffer, NULL);
+        for (l = 0; l <= pt->last_level; l++) {
+		if (nv20mt->level[l].image_offset)
+			FREE(nv20mt->level[l].image_offset);
+        }
 }
 
 static struct pipe_surface *
@@ -178,7 +171,7 @@ nv20_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
 	ns->base.height = pt->height[level];
 	ns->base.usage = flags;
 	ns->base.status = PIPE_SURFACE_STATUS_DEFINED;
-	ns->base.refcount = 1;
+	pipe_reference_init(&ns->base.reference, 1);
 	ns->base.face = face;
 	ns->base.level = level;
 	ns->base.zslice = zslice;
@@ -197,15 +190,8 @@ nv20_miptree_surface_get(struct pipe_screen *screen, struct pipe_texture *pt,
 }
 
 static void
-nv20_miptree_surface_release(struct pipe_screen *pscreen,
-			     struct pipe_surface **psurface)
+nv20_miptree_surface_destroy(struct pipe_surface *ps)
 {
-	struct pipe_surface *ps = *psurface;
-
-	*psurface = NULL;
-	if (--ps->refcount > 0)
-		return;
-
 	pipe_texture_reference(&ps->texture, NULL);
 	FREE(ps);
 }
@@ -214,8 +200,8 @@ void nv20_screen_init_miptree_functions(struct pipe_screen *pscreen)
 {
 	pscreen->texture_create = nv20_miptree_create;
 	pscreen->texture_blanket = nv20_miptree_blanket;
-	pscreen->texture_release = nv20_miptree_release;
+	pscreen->texture_destroy = nv20_miptree_destroy;
 	pscreen->get_tex_surface = nv20_miptree_surface_get;
-	pscreen->tex_surface_release = nv20_miptree_surface_release;
+	pscreen->tex_surface_destroy = nv20_miptree_surface_destroy;
 }
 
diff --git a/src/gallium/drivers/nv20/nv20_prim_vbuf.c b/src/gallium/drivers/nv20/nv20_prim_vbuf.c
index 319e1f65572..8aa342cd2db 100644
--- a/src/gallium/drivers/nv20/nv20_prim_vbuf.c
+++ b/src/gallium/drivers/nv20/nv20_prim_vbuf.c
@@ -112,8 +112,8 @@ nv20__allocate_mbuffer(struct nv20_vbuf_render *nv20_render, size_t size)
 static void
 nv20__allocate_pbuffer(struct nv20_vbuf_render *nv20_render, size_t size)
 {
-	struct pipe_winsys *winsys = nv20_render->nv20->pipe.winsys;
-	nv20_render->pbuffer = winsys->buffer_create(winsys, 64,
+	struct pipe_screen *screen = nv20_render->nv20->pipe.screen;
+	nv20_render->pbuffer = screen->buffer_create(screen, 64,
 					PIPE_BUFFER_USAGE_VERTEX, size);
 }
 
@@ -361,7 +361,7 @@ nv20_vbuf_render_release_vertices( struct vbuf_render *render )
 	struct pipe_screen *pscreen = &nv20->screen->pipe;
 
 	if (nv20_render->pbuffer) {
-		pipe_buffer_reference(pscreen, &nv20_render->pbuffer, NULL);
+		pipe_buffer_reference(&nv20_render->pbuffer, NULL);
 	} else if (nv20_render->mbuffer) {
 		FREE(nv20_render->mbuffer);
 		nv20_render->mbuffer = NULL;
diff --git a/src/gallium/drivers/nv20/nv20_transfer.c b/src/gallium/drivers/nv20/nv20_transfer.c
index 1631637067d..e5255296aae 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;
 }