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().

3 files changed, 9 insertions, 9 deletions

diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 0bd69c214f..7304113a65 100644
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -175,7 +175,7 @@ crtc_destroy(xf86CrtcPtr crtc)
     struct crtc_private *crtcp = crtc->driver_private;
 
     if (crtcp->cursor_buf)
-	pipe_buffer_reference(ms->screen, &crtcp->cursor_buf, NULL);
+	pipe_buffer_reference(&crtcp->cursor_buf, NULL);
 
     drmModeFreeCrtc(crtcp->drm_crtc);
     xfree(crtcp);
@@ -266,7 +266,7 @@ cursor_destroy(xf86CrtcPtr crtc)
     struct crtc_private *crtcp = crtc->driver_private;
 
     if (crtcp->cursor_buf) {
-	pipe_buffer_reference(ms->screen, &crtcp->cursor_buf, NULL);
+	pipe_buffer_reference(&crtcp->cursor_buf, NULL);
     }
 }
 
diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index d48b7dd27b..b9993b1ea1 100644
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -147,7 +147,7 @@ driDestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
 	    (*pScreen->DestroyPixmap)(private->pPixmap);
 
 	pipe_texture_reference(&private->tex, NULL);
-	pipe_buffer_reference(ms->screen, &private->buf, NULL);
+	pipe_buffer_reference(&private->buf, NULL);
     }
 
     if (buffers) {
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index c62625c448..e53b46c3ad 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -147,7 +147,7 @@ ExaFinishAccess(PixmapPtr pPix, int index)
 	return;
 
     exa->scrn->transfer_unmap(exa->scrn, priv->map_transfer);
-    pipe_transfer_reference(&priv->map_transfer, NULL);
+    exa->scrn->tex_transfer_destroy(priv->map_transfer);
 
 }
 
@@ -163,7 +163,7 @@ ExaDone(PixmapPtr pPixmap)
 	return;
 
     if (priv->src_surf)
-	exa->scrn->tex_surface_release(exa->scrn, &priv->src_surf);
+	exa->scrn->tex_surface_destroy(priv->src_surf);
     priv->src_surf = NULL;
 }
 
@@ -219,7 +219,7 @@ ExaSolid(PixmapPtr pPixmap, int x0, int y0, int x1, int y1)
     exa->ctx->surface_fill(exa->ctx, surf, x0, y0, x1 - x0, y1 - y0,
 			   priv->color);
 
-    exa->scrn->tex_surface_release(exa->scrn, &surf);
+    exa->scrn->tex_surface_destroy(surf);
 }
 
 static Bool
@@ -276,7 +276,7 @@ ExaCopy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY,
 
     exa->ctx->surface_copy(exa->ctx, 0, surf, dstX, dstY, priv->src_surf,
 			   srcX, srcY, width, height);
-    exa->scrn->tex_surface_release(exa->scrn, &surf);
+    exa->scrn->tex_surface_destroy(surf);
 }
 
 static Bool
@@ -336,7 +336,7 @@ ExaDestroyPixmap(ScreenPtr pScreen, void *dPriv)
 	return;
 
     if (priv->tex)
-	ms->screen->texture_release(exa->scrn, &priv->tex);
+	ms->screen->texture_destroy(priv->tex);
 
     xfree(priv);
 }
@@ -382,7 +382,7 @@ xorg_exa_get_pixmap_handle(PixmapPtr pPixmap)
 
     drm_api_hooks.buffer_from_texture(priv->tex, &buffer, &stride);
     drm_api_hooks.handle_from_buffer(ms->screen, buffer, &handle);
-    pipe_buffer_reference(ms->screen, &buffer, NULL);
+    pipe_buffer_reference(&buffer, NULL);
     return handle;
 }