summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2009-08-12 15:38:45 -0400
committerAlex Deucher <[email protected]>2009-08-12 15:40:15 -0400
commita245c05dd3a1ca48204dd84252e6964aba91d4df (patch)
tree7fce4c3367409a47ad712177a3d0b2a13b177840 /src/mesa
parentb0c191acaf0fbbfa743781908187344f5081a083 (diff)
r600: fix warning
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_bo_legacy.c4
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_bo_legacy.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
index 6d6ae5d3b2f..d6d22cb4c37 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
@@ -932,7 +932,7 @@ unsigned radeon_bo_legacy_relocs_size(struct radeon_bo *bo)
* Fake up a bo for things like texture image_override.
* bo->offset already includes fb_location
*/
-struct bo_legacy *radeon_legacy_bo_alloc_fake(struct radeon_bo_manager *bom,
+struct radeon_bo *radeon_legacy_bo_alloc_fake(struct radeon_bo_manager *bom,
int size,
uint32_t offset)
{
@@ -954,6 +954,6 @@ struct bo_legacy *radeon_legacy_bo_alloc_fake(struct radeon_bo_manager *bom,
boml->nhandle = bo->base.handle + 1;
}
radeon_bo_ref(&(bo->base));
- return bo;
+ return &(bo->base);
}
diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
index b57d6df9aaa..455adebc099 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
@@ -42,7 +42,7 @@ struct radeon_bo_manager *radeon_bo_manager_legacy_ctor(struct radeon_screen *sc
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);
-struct bo_legacy *radeon_legacy_bo_alloc_fake(struct radeon_bo_manager *bom,
+struct radeon_bo *radeon_legacy_bo_alloc_fake(struct radeon_bo_manager *bom,
int size,
uint32_t offset);