summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@code-monkey.de>2010-10-28 21:27:37 +0200
committerTilman Sauerbeck <tilman@code-monkey.de>2010-11-02 21:52:38 +0100
commit4e34393162660a8429ef33e6ec48cfdd01090d70 (patch)
tree3424c5be566faa080ad933175cd0c2ec96d54108
parent1318b0ef9ee06d7cc5f69cf8be15c5b0fb31cabd (diff)
r600g: Removed unused 'ptr' argument from radeon_bo().
Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
-rw-r--r--src/gallium/winsys/r600/drm/r600_priv.h2
-rw-r--r--src/gallium/winsys/r600/drm/radeon_bo.c5
-rw-r--r--src/gallium/winsys/r600/drm/radeon_bo_pb.c5
3 files changed, 4 insertions, 8 deletions
diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index b5bd7bd92c..117d0597ad 100644
--- 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 2d08686fc4..dcee00de86 100644
--- 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 a3452027f2..4454f5213a 100644
--- 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;