From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 12 Aug 2009 19:38:45 +0000 (-0400)
Subject: r600: fix warning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a245c05dd3a1ca48204dd84252e6964aba91d4df;p=mesa.git

r600: fix warning
---

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);