From 39db886548b9e93a6a91bf76095848af44972e43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 2 Aug 2011 23:03:11 +0200 Subject: [PATCH] r600g: remove unused r600_bo::tiling_flags Reviewed-by: Alex Deucher --- src/gallium/winsys/r600/drm/r600_bo.c | 9 +++++---- src/gallium/winsys/r600/drm/r600_priv.h | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c index f74e0a498cd..9e6c7cc7639 100644 --- a/src/gallium/winsys/r600/drm/r600_bo.c +++ b/src/gallium/winsys/r600/drm/r600_bo.c @@ -91,6 +91,7 @@ struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whan { struct r600_bo *bo = calloc(1, sizeof(struct r600_bo)); struct radeon_bo *rbo; + unsigned tiling_flags; rbo = bo->bo = radeon_bo(radeon, whandle->handle, 0, 0, 0); if (rbo == NULL) { @@ -107,12 +108,12 @@ struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whan if (stride) *stride = whandle->stride; - radeon_bo_get_tiling_flags(radeon, rbo, &bo->tiling_flags); + radeon_bo_get_tiling_flags(radeon, rbo, &tiling_flags); if (array_mode) { - if (bo->tiling_flags) { - if (bo->tiling_flags & RADEON_TILING_MACRO) + if (tiling_flags) { + if (tiling_flags & RADEON_TILING_MACRO) *array_mode = V_0280A0_ARRAY_2D_TILED_THIN1; - else if (bo->tiling_flags & RADEON_TILING_MICRO) + else if (tiling_flags & RADEON_TILING_MICRO) *array_mode = V_0280A0_ARRAY_1D_TILED_THIN1; } else { *array_mode = 0; diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h index 50783a61069..c310defe2b1 100644 --- a/src/gallium/winsys/r600/drm/r600_priv.h +++ b/src/gallium/winsys/r600/drm/r600_priv.h @@ -95,7 +95,6 @@ struct r600_bo { struct pipe_reference reference; /* this must be the first member for the r600_bo_reference inline to work */ /* DO NOT MOVE THIS ^ */ unsigned size; - unsigned tiling_flags; unsigned domains; struct radeon_bo *bo; unsigned fence; -- 2.30.2