From 5229ba494b4b3f19085d13131a37626b914d4014 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 4 Aug 2011 05:40:16 +0200 Subject: [PATCH] r600g: remove radeon_bo::handle This should be private to radeon_winsys. Reviewed-by: Alex Deucher --- src/gallium/winsys/r600/drm/r600_hw_context.c | 6 +++--- src/gallium/winsys/r600/drm/r600_priv.h | 1 - src/gallium/winsys/r600/drm/radeon_bo.c | 1 - src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 7 ------- src/gallium/winsys/radeon/drm/radeon_winsys.h | 4 ---- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c index 0ebb5ed0385..b2da3eb0458 100644 --- a/src/gallium/winsys/r600/drm/r600_hw_context.c +++ b/src/gallium/winsys/r600/drm/r600_hw_context.c @@ -1130,11 +1130,11 @@ void r600_context_pipe_state_set_resource(struct r600_context *ctx, struct r600_ if (!dirty) { if (is_vertex) { - if (block->reloc[1].bo->bo->handle != state->bo[0]->bo->handle) + if (block->reloc[1].bo->bo->buf != state->bo[0]->bo->buf) dirty |= R600_BLOCK_STATUS_RESOURCE_DIRTY; } else { - if ((block->reloc[1].bo->bo->handle != state->bo[0]->bo->handle) || - (block->reloc[2].bo->bo->handle != state->bo[1]->bo->handle)) + if ((block->reloc[1].bo->bo->buf != state->bo[0]->bo->buf) || + (block->reloc[2].bo->bo->buf != state->bo[1]->bo->buf)) dirty |= R600_BLOCK_STATUS_RESOURCE_DIRTY; } } diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h index 90860f4e31b..1f311c4d5e3 100644 --- a/src/gallium/winsys/r600/drm/r600_priv.h +++ b/src/gallium/winsys/r600/drm/r600_priv.h @@ -64,7 +64,6 @@ struct radeon_bo { struct pipe_reference reference; struct pb_buffer *buf; struct radeon_winsys_cs_handle *cs_buf; - unsigned handle; unsigned size; unsigned last_flush; diff --git a/src/gallium/winsys/r600/drm/radeon_bo.c b/src/gallium/winsys/r600/drm/radeon_bo.c index 14f8d340d67..1d3766e55b5 100644 --- a/src/gallium/winsys/r600/drm/radeon_bo.c +++ b/src/gallium/winsys/r600/drm/radeon_bo.c @@ -58,7 +58,6 @@ struct radeon_bo *radeon_bo(struct radeon *radeon, unsigned handle, return NULL; } bo->cs_buf = radeon->ws->buffer_get_cs_handle(bo->buf); - bo->handle = radeon->ws->trans_get_buffer_handle(bo->buf); bo->size = size; return bo; } diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index 58898d3423e..609a9065db8 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -617,11 +617,6 @@ static boolean radeon_winsys_bo_get_handle(struct pb_buffer *buffer, return TRUE; } -static unsigned trans_get_buffer_handle(struct pb_buffer *buf) -{ - return get_radeon_bo(buf)->handle; -} - void radeon_bomgr_init_functions(struct radeon_drm_winsys *ws) { ws->base.buffer_get_cs_handle = radeon_drm_get_cs_handle; @@ -634,6 +629,4 @@ void radeon_bomgr_init_functions(struct radeon_drm_winsys *ws) ws->base.buffer_create = radeon_winsys_bo_create; ws->base.buffer_from_handle = radeon_winsys_bo_from_handle; ws->base.buffer_get_handle = radeon_winsys_bo_get_handle; - - ws->base.trans_get_buffer_handle = trans_get_buffer_handle; } diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h index 47274055207..9f70c5c2f9f 100644 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h @@ -329,10 +329,6 @@ struct radeon_winsys { boolean (*cs_request_feature)(struct radeon_winsys_cs *cs, enum radeon_feature_id fid, boolean enable); - - - /* Transitional functions for r600g when moving to winsys/radeon */ - unsigned (*trans_get_buffer_handle)(struct pb_buffer *buf); }; #endif -- 2.30.2