Mesa (r6xx-rewrite): radeon bo: Fix merge fall out

Alex Deucher agd5f at kemper.freedesktop.org
Wed Jul 15 19:59:37 UTC 2009


Module: Mesa
Branch: r6xx-rewrite
Commit: 1e8a6068ee8b914bc601613c5e1655184c1cc05b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e8a6068ee8b914bc601613c5e1655184c1cc05b

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Jul 15 15:59:04 2009 -0400

radeon bo: Fix merge fall out

---

 src/mesa/drivers/dri/radeon/radeon_bo_drm.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_drm.h b/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
index 655b52a..d1db251 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_drm.h
@@ -187,6 +187,13 @@ static inline int _radeon_bo_wait(struct radeon_bo *bo,
     return bo->bom->funcs->bo_wait(bo);
 }
 
+static inline int radeon_bo_is_static(struct radeon_bo *bo)
+{
+	if (bo->bom->funcs->bo_is_static)
+		return bo->bom->funcs->bo_is_static(bo);
+	return 0;
+}
+
 #ifdef RADEON_DEBUG_BO
 #define radeon_bo_open(bom, h, s, a, d, f, u)\
     _radeon_bo_open(bom, h, s, a, d, f, u, __FILE__, __FUNCTION__, __LINE__)




More information about the mesa-commit mailing list