diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-15 17:05:54 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-15 17:05:54 +0100 |
commit | 6559b6e28bf111b64c3aeb5ec1260acfeb3e0b7f (patch) | |
tree | 000004c00befc22de72682a1b251b01fcfb0b1f4 /src/radeon_textured_video.c | |
parent | 857179e538c9752fab239a21312d0fcc80022151 (diff) |
radeon: drop offset member of r600 accel object
This is always 0 now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/radeon_textured_video.c')
-rw-r--r-- | src/radeon_textured_video.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index 1a0d51d2..80650c31 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -257,24 +257,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, } if (pPriv->video_memory == NULL) { - pPriv->video_offset = radeon_legacy_allocate_memory(pScrn, - &pPriv->video_memory, - size, pPriv->hw_align, - RADEON_GEM_DOMAIN_GTT); - if (pPriv->video_offset == 0) - return BadAlloc; - - pPriv->src_bo[0] = pPriv->video_memory; - radeon_legacy_allocate_memory(pScrn, (void*)&pPriv->src_bo[1], size, - pPriv->hw_align, - RADEON_GEM_DOMAIN_GTT); + int ret; + ret = radeon_legacy_allocate_memory(pScrn, + &pPriv->video_memory, + size, pPriv->hw_align, + RADEON_GEM_DOMAIN_GTT); + if (ret == 0) + return BadAlloc; + + pPriv->src_bo[0] = pPriv->video_memory; + radeon_legacy_allocate_memory(pScrn, (void*)&pPriv->src_bo[1], size, + pPriv->hw_align, + RADEON_GEM_DOMAIN_GTT); } /* Bicubic filter loading */ if (pPriv->bicubic_enabled) { if (info->bicubic_offset == 0) pPriv->bicubic_enabled = FALSE; - pPriv->bicubic_src_offset = info->bicubic_offset; } if (pDraw->type == DRAWABLE_WINDOW) @@ -291,8 +291,6 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, top = (y1 >> 16) & ~1; nlines = ((y2 + 0xffff) >> 16) - top; - pPriv->src_offset = pPriv->video_offset; - pPriv->currentBuffer ^= 1; src_bo = pPriv->src_bo[pPriv->currentBuffer]; |