KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600g: remove radeon_bo::handle 

This should be private to radeon_winsys.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2011-08-04 05:40:16 +02:00
parent ab630b5768
commit 5229ba494b
5 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/winsys/r600/drm/r600_hw_context.c
View File

@ -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;
}
}

1
src/gallium/winsys/r600/drm/r600_priv.h
View File

@ -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;

1
src/gallium/winsys/r600/drm/radeon_bo.c
View File

@ -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;
}

7
src/gallium/winsys/radeon/drm/radeon_drm_bo.c
View File

@ -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;
}

4
src/gallium/winsys/radeon/drm/radeon_winsys.h
View File

@ -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