From 11606e873d38a320195ab4e23181579f766ae45c Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 16 Jul 2009 02:59:36 -0400 Subject: [PATCH] Fix more merge fallout --- src/mesa/drivers/dri/r600/r600_cmdbuf.c | 2 +- src/mesa/drivers/dri/radeon/radeon_bo_legacy.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c index 7bde3360b61..95a311dac71 100644 --- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c +++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c @@ -521,7 +521,7 @@ static int r600_cs_check_space(struct radeon_cs *cs, struct radeon_cs_space_chec write_domain = bos[i].write_domain; /* pinned bos don't count */ - if (radeon_legacy_bo_is_static(bo)) + if (radeon_bo_is_static(bo)) continue; /* already accounted this bo */ diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h index 9187cd72013..0db817cab07 100644 --- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h +++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h @@ -43,5 +43,4 @@ void radeon_bo_manager_legacy_dtor(struct radeon_bo_manager *bom); void radeon_bo_legacy_texture_age(struct radeon_bo_manager *bom); unsigned radeon_bo_legacy_relocs_size(struct radeon_bo *bo); -int radeon_legacy_bo_is_static(struct radeon_bo *bo); #endif -- 2.30.2