r600g: remove some pointless and unused functions

diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c
index 122a68884b4eeeeb12183c97a92126e2f9054844..e9c650d23be7c0c0f4eb77ebef1bc2ef77b7a463 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_bo.c
+++ b/src/gallium/winsys/r600/drm/r600_bo.c
@@ -178,7 +178,7 @@ boolean r600_bo_get_winsys_handle(struct radeon *radeon, struct r600_bo *bo,
        whandle->stride = stride;
        switch(whandle->type) {
        case DRM_API_HANDLE_TYPE_KMS:
-               whandle->handle = r600_bo_get_handle(bo);
+               whandle->handle = bo->bo->handle;
                break;
        case DRM_API_HANDLE_TYPE_SHARED:
                if (radeon_bo_get_name(radeon, bo->bo, &whandle->handle))

diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c
index 662455be28c172fee5db69af49964276b060a73d..e28ef1f162dddd9b9126fa72cefd64d27b3a2b9d 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_hw_context.c
+++ b/src/gallium/winsys/r600/drm/r600_hw_context.c
@@ -798,7 +798,7 @@ void r600_context_bo_flush(struct r600_context *ctx, unsigned flush_flags,
                                unsigned flush_mask, struct r600_bo *rbo)
 {
        struct radeon_bo *bo;
-       bo = r600_bo_get_bo(rbo);
+       bo = rbo->bo;
        /* if bo has already been flushed */
        if (!(~bo->last_flush & flush_flags)) {
                bo->last_flush &= flush_mask;
@@ -818,7 +818,7 @@ void r600_context_bo_reloc(struct r600_context *ctx, u32 *pm4, struct r600_bo *r
 {
        struct radeon_bo *bo;
 
-       bo = r600_bo_get_bo(rbo);
+       bo = rbo->bo;
        assert(bo != NULL);
        if (bo->reloc) {
                *pm4 = bo->reloc_id;

diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index ed0f3e584d3befdf1fbc48c2bdfb3b2735a3e7c3..27bdf2b1df88ff0bae446cf7808ea9fe098a49e5 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -201,24 +201,6 @@ static inline void radeon_bo_unmap(struct radeon *radeon, struct radeon_bo *bo)
        assert(bo->map_count >= 0);
 }
 
-/*
- * r600_bo
- */
-static inline struct radeon_bo *r600_bo_get_bo(struct r600_bo *bo)
-{
-       return bo->bo;
-}
-
-static unsigned inline r600_bo_get_handle(struct r600_bo *bo)
-{
-       return bo->bo->handle;
-}
-
-static unsigned inline r600_bo_get_size(struct r600_bo *bo)
-{
-       return bo->size;
-}
-
 /*
  * fence
  */