From: Marek Olšák Date: Wed, 3 Aug 2011 00:24:15 +0000 (+0200) Subject: r600g: remove now-unused r600_context::fenced_bo X-Git-Tag: android-x86-4.4-r1~10387^2~271 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9865b1ec8c88154d8ceb982c42844b68e9224217;p=android-x86%2Fexternal-mesa.git r600g: remove now-unused r600_context::fenced_bo Reviewed-by: Alex Deucher --- diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 7e704730122..043215b3ec7 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -254,11 +254,11 @@ struct r600_context { unsigned creloc; struct r600_reloc *reloc; struct radeon_bo **bo; + u32 *pm4; struct list_head query_list; unsigned num_query_running; unsigned backend_mask; - struct list_head fenced_bo; unsigned max_db; /* for OQ */ unsigned num_dest_buffers; unsigned flags; diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c index 94206d5568b..df89047ebc5 100644 --- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c +++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c @@ -1008,13 +1008,9 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon) r600_init_cs(ctx); /* save 16dwords space for fence mecanism */ ctx->pm4_ndwords -= 16; - ctx->max_db = 8; - LIST_INITHEAD(&ctx->fenced_bo); - r600_get_backend_mask(ctx); - return 0; out_err: r600_context_fini(ctx); diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c index e125fc82e3c..4d8bb184cbd 100644 --- a/src/gallium/winsys/r600/drm/r600_hw_context.c +++ b/src/gallium/winsys/r600/drm/r600_hw_context.c @@ -934,13 +934,9 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon) r600_init_cs(ctx); /* save 16dwords space for fence mecanism */ ctx->pm4_ndwords -= 16; - - LIST_INITHEAD(&ctx->fenced_bo); - ctx->max_db = 4; r600_get_backend_mask(ctx); - return 0; out_err: r600_context_fini(ctx);