merge buffer_unreference(), buffer_reference()

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mesa/pipe/softpipe/sp_region.c b/src/mesa/pipe/softpipe/sp_region.c
index 25d0a419aa3..ae05b1d0dea 100644
--- a/src/mesa/pipe/softpipe/sp_region.c
+++ b/src/mesa/pipe/softpipe/sp_region.c
@@ -121,8 +121,8 @@ sp_region_release(struct pipe_context *pipe, struct pipe_region **region)
    if ((*region)->refcount == 0) {
       assert((*region)->map_refcount == 0);
 
-      sp->pipe.winsys->buffer_unreference( sp->pipe.winsys,
-                                           &((*region)->buffer) );
+      sp->pipe.winsys->buffer_reference( sp->pipe.winsys,
+                                         &((*region)->buffer), NULL );
       free(*region);
    }
    *region = NULL;
diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c
index 9e3ff6d35c0..5ab246896b9 100644
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/mesa/pipe/softpipe/sp_state_fs.c
@@ -68,8 +68,9 @@ void softpipe_set_constant_buffer(struct pipe_context *pipe,
    assert(index == 0);
 
    /* note: reference counting */
-   ws->buffer_unreference(ws, &softpipe->constants[shader].buffer);
-   softpipe->constants[shader].buffer = ws->buffer_reference(ws, buf->buffer);
+   ws->buffer_reference(ws,
+                        &softpipe->constants[shader].buffer,
+                        buf->buffer);
    softpipe->constants[shader].size = buf->size;
 
    softpipe->dirty |= SP_NEW_CONSTANTS;