summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/r600
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-08-02 21:18:10 +0200
committerMarek Olšák <[email protected]>2011-08-16 09:15:10 +0200
commitc092e236cc049cc56e9d0d337defc96729cf5830 (patch)
tree7c37b20098ab2ca395450570b0c3d78b4b415d8c /src/gallium/winsys/r600
parent2ce783d8ddec1b1fcadc0798af0ebb045bba1cc4 (diff)
r600g: remove unused r600_bo::kernel_pitch
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/winsys/r600')
-rw-r--r--src/gallium/winsys/r600/drm/r600_bo.c2
-rw-r--r--src/gallium/winsys/r600/drm/r600_priv.h4
-rw-r--r--src/gallium/winsys/r600/drm/radeon_bo.c4
3 files changed, 3 insertions, 7 deletions
diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c
index bbd52a1fdde..f74e0a498cd 100644
--- a/src/gallium/winsys/r600/drm/r600_bo.c
+++ b/src/gallium/winsys/r600/drm/r600_bo.c
@@ -107,7 +107,7 @@ struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whan
if (stride)
*stride = whandle->stride;
- radeon_bo_get_tiling_flags(radeon, rbo, &bo->tiling_flags, &bo->kernel_pitch);
+ radeon_bo_get_tiling_flags(radeon, rbo, &bo->tiling_flags);
if (array_mode) {
if (bo->tiling_flags) {
if (bo->tiling_flags & RADEON_TILING_MACRO)
diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h
index 8296aa1bdd1..50783a61069 100644
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -96,7 +96,6 @@ struct r600_bo {
/* DO NOT MOVE THIS ^ */
unsigned size;
unsigned tiling_flags;
- unsigned kernel_pitch;
unsigned domains;
struct radeon_bo *bo;
unsigned fence;
@@ -140,8 +139,7 @@ int radeon_bo_busy(struct radeon *radeon, struct radeon_bo *bo, uint32_t *domain
int radeon_bo_fencelist(struct radeon *radeon, struct radeon_bo **bolist, uint32_t num_bo);
int radeon_bo_get_tiling_flags(struct radeon *radeon,
struct radeon_bo *bo,
- uint32_t *tiling_flags,
- uint32_t *pitch);
+ uint32_t *tiling_flags);
int radeon_bo_get_name(struct radeon *radeon,
struct radeon_bo *bo,
uint32_t *name);
diff --git a/src/gallium/winsys/r600/drm/radeon_bo.c b/src/gallium/winsys/r600/drm/radeon_bo.c
index 80336de4537..4e61c942a26 100644
--- a/src/gallium/winsys/r600/drm/radeon_bo.c
+++ b/src/gallium/winsys/r600/drm/radeon_bo.c
@@ -220,8 +220,7 @@ int radeon_bo_busy(struct radeon *radeon, struct radeon_bo *bo, uint32_t *domain
int radeon_bo_get_tiling_flags(struct radeon *radeon,
struct radeon_bo *bo,
- uint32_t *tiling_flags,
- uint32_t *pitch)
+ uint32_t *tiling_flags)
{
struct drm_radeon_gem_get_tiling args = {};
int ret;
@@ -233,7 +232,6 @@ int radeon_bo_get_tiling_flags(struct radeon *radeon,
return ret;
*tiling_flags = args.tiling_flags;
- *pitch = args.pitch;
return ret;
}