Fix more merge fallout

diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
index 7bde3360b61e8f0e80dc0ccf0d4c6009cdc245a5..95a311dac715f7e242657da8eb242de7d79c28df 100644 (file)
--- 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 9187cd720134cc42b90a165b3553aacc05b528d5..0db817cab07edfb4cac9deba8280bf4aaf4698e4 100644 (file)
--- 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