[Mesa-dev] [PATCH 4/6] i965: Replace dri_bo_release with drm_intel_bo_unreference.

Kenneth Graunke kenneth at whitecape.org
Wed Oct 16 04:02:46 CEST 2013


dri_bo_release is a helper function that calls drm_intel_bo_unreference
but then also sets the pointer to NULL.  This is unnecessary, since
brw_destroy_context is called from intelDestroyContext, which also frees
brw completely.

If you're still trying to access them, you've got bigger problems.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/mesa/drivers/dri/i965/brw_vtbl.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c
index d78af8b..7f34083 100644
--- a/src/mesa/drivers/dri/i965/brw_vtbl.c
+++ b/src/mesa/drivers/dri/i965/brw_vtbl.c
@@ -55,14 +55,6 @@
 
 #include "glsl/ralloc.h"
 
-static void
-dri_bo_release(drm_intel_bo **bo)
-{
-   drm_intel_bo_unreference(*bo);
-   *bo = NULL;
-}
-
-
 /**
  * called from intelDestroyContext()
  */
@@ -80,9 +72,9 @@ brw_destroy_context(struct brw_context *brw)
    brw_destroy_state(brw);
    brw_draw_destroy( brw );
 
-   dri_bo_release(&brw->curbe.curbe_bo);
-   dri_bo_release(&brw->vs.base.const_bo);
-   dri_bo_release(&brw->wm.base.const_bo);
+   drm_intel_bo_unreference(brw->curbe.curbe_bo);
+   drm_intel_bo_unreference(brw->vs.base.const_bo);
+   drm_intel_bo_unreference(brw->wm.base.const_bo);
 
    free(brw->curbe.last_buf);
    free(brw->curbe.next_buf);
-- 
1.8.3.2



More information about the mesa-dev mailing list