summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-07-16 02:59:36 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-07-16 02:59:36 -0400
commit11606e873d38a320195ab4e23181579f766ae45c (patch)
tree2bcdd79d5d8864ebc4a2c8b4be6730042ffd64ee
parent92a2f0164aece1584e7c4ea8c5c44af43a1de8c3 (diff)
Fix more merge fallout
-rw-r--r--src/mesa/drivers/dri/r600/r600_cmdbuf.c2
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_bo_legacy.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
index 7bde3360b6..95a311dac7 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 9187cd7201..0db817cab0 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