summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/r600
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-08-04 05:40:16 +0200
committerMarek Olšák <[email protected]>2011-08-16 09:15:11 +0200
commit5229ba494b4b3f19085d13131a37626b914d4014 (patch)
treefbcd901872457136aff9b5af024f8a49e5a6eccc /src/gallium/winsys/r600
parentab630b5768b0bfa4d7729d110ce4fb8f42e0cfb9 (diff)
r600g: remove radeon_bo::handle
This should be private to radeon_winsys. Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/winsys/r600')
-rw-r--r--src/gallium/winsys/r600/drm/r600_hw_context.c6
-rw-r--r--src/gallium/winsys/r600/drm/r600_priv.h1
-rw-r--r--src/gallium/winsys/r600/drm/radeon_bo.c1
3 files changed, 3 insertions, 5 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;
}