summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKusanagi Kouichi <slash@ac.auone-net.jp>2010-01-22 17:18:51 +0900
committerAlex Deucher <alexdeucher@gmail.com>2010-01-22 10:27:27 -0500
commitde40d36264364434541377c7f65f3836dc514fc0 (patch)
tree91a4b3e73868b81c86163ec0031f2f658f726483 /src
parent30a19b75cc82b8e04c45e6684b84f9a4ccc0505b (diff)
Remove unnecessary checks.
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Diffstat (limited to 'src')
-rw-r--r--src/radeon_textured_video.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 2e5d7637..fdc077e7 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -316,21 +316,16 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
}
if (pPriv->video_memory == NULL) {
- if (info->ChipFamily >= CHIP_FAMILY_R600)
- pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
- &pPriv->video_memory,
- size, 256);
- else
- pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
- &pPriv->video_memory,
- size, 64);
+ pPriv->video_offset = radeon_legacy_allocate_memory(pScrn,
+ &pPriv->video_memory,
+ size, hw_align + 1);
if (pPriv->video_offset == 0)
return BadAlloc;
if (info->cs) {
pPriv->src_bo[0] = pPriv->video_memory;
radeon_legacy_allocate_memory(pScrn, (void*)&pPriv->src_bo[1], size,
- info->ChipFamily >= CHIP_FAMILY_R600 ? 256 : 64);
+ hw_align + 1);
}
}