i965: Make brw_bo_unmap a static inline.

With the broken debugging code gone, it doesn't do anything anymore.
We could technically eliminate it, but I'd like to keep it around in
case we want to add something there again someday.  Otherwise we'd
have to go all over the codebase adding unmap calls back again.

Based on a patch by Chris Wilson.

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 9e67efa4d3b8f7bebf1af102178ef7bc513ffadd..7f3aa420ed97703ebf188894914dac66c2a90440 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -762,12 +762,6 @@ brw_bo_map(struct brw_context *brw, struct brw_bo *bo, unsigned flags)
       return brw_bo_map_gtt(brw, bo, flags);
 }
 
-int
-brw_bo_unmap(struct brw_bo *bo)
-{
-   return 0;
-}
-
 int
 brw_bo_subdata(struct brw_bo *bo, uint64_t offset,
                uint64_t size, const void *data)

diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index 6482abd09afcdcd54da555290f9b7756124f09c7..a817958d7bd99410021f2b879427200f0445e521 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -212,7 +212,7 @@ MUST_CHECK void *brw_bo_map(struct brw_context *brw, struct brw_bo *bo, unsigned
  * Reduces the refcount on the userspace mapping of the buffer
  * object.
  */
-int brw_bo_unmap(struct brw_bo *bo);
+static int brw_bo_unmap(struct brw_bo *bo) { return 0; }
 
 /** Write data into an object. */
 int brw_bo_subdata(struct brw_bo *bo, uint64_t offset,