r600g: Removed unused 'ptr' argument from radeon_bo().

Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>

diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index b5bd7bd92c1d31bd1e8108ecd8bfd51b408fe59d..117d0597ad51b211664e6dee6d18c1d7515312f2 100644 (file)
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -90,7 +90,7 @@ struct radeon *radeon_decref(struct radeon *radeon);
 
 /* radeon_bo.c */
 struct radeon_bo *radeon_bo(struct radeon *radeon, unsigned handle,
-                           unsigned size, unsigned alignment, void *ptr);
+                           unsigned size, unsigned alignment);
 void radeon_bo_reference(struct radeon *radeon, struct radeon_bo **dst,
                         struct radeon_bo *src);
 int radeon_bo_wait(struct radeon *radeon, struct radeon_bo *bo);

diff --git a/src/gallium/winsys/r600/drm/radeon_bo.c b/src/gallium/winsys/r600/drm/radeon_bo.c
index 2d08686fc43072d9593957f33c46b592d4f456cd..dcee00de864bffb211ba667ff80a3ac85c687aab 100644 (file)
--- a/src/gallium/winsys/r600/drm/radeon_bo.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo.c
@@ -69,7 +69,7 @@ static void radeon_bo_fixed_unmap(struct radeon *radeon, struct radeon_bo *bo)
 }
 
 struct radeon_bo *radeon_bo(struct radeon *radeon, unsigned handle,
-                       unsigned size, unsigned alignment, void *ptr)
+                       unsigned size, unsigned alignment)
 {
        struct radeon_bo *bo;
        int r;
@@ -121,9 +121,6 @@ struct radeon_bo *radeon_bo(struct radeon *radeon, unsigned handle,
                radeon_bo_reference(radeon, &bo, NULL);
                return bo;
        }
-       if (ptr) {
-               memcpy(bo->data, ptr, size);
-       }
        return bo;
 }
 

diff --git a/src/gallium/winsys/r600/drm/radeon_bo_pb.c b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
index a3452027f2760372df1cc474222c2d9ed164128c..4454f5213aad948595daa43b8cfb03c61e049560 100644 (file)
--- a/src/gallium/winsys/r600/drm/radeon_bo_pb.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo_pb.c
@@ -172,7 +172,7 @@ radeon_bo_pb_create_buffer_from_handle(struct pb_manager *_mgr,
        struct radeon_bo_pb *bo;
        struct radeon_bo *hw_bo;
 
-       hw_bo = radeon_bo(radeon, handle, 0, 0, NULL);
+       hw_bo = radeon_bo(radeon, handle, 0, 0);
        if (hw_bo == NULL)
                return NULL;
 
@@ -217,8 +217,7 @@ radeon_bo_pb_create_buffer(struct pb_manager *_mgr,
 
        LIST_INITHEAD(&bo->maplist);
 
-       bo->bo = radeon_bo(radeon, 0, size,
-                          desc->alignment, NULL);
+       bo->bo = radeon_bo(radeon, 0, size, desc->alignment);
        if (bo->bo == NULL)
                goto error2;
        return &bo->b;