diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2008-07-30 00:54:32 -0700 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 06:22:36 -0400 |
| commit | a4ec30a677906ec2ff9824c7ddca586655f6d1a8 (patch) | |
| tree | 0a9acb45670f97f88b7e38a3dd9e6631ee14f355 /src/radeon_video.c | |
| parent | f3b81c7582aed307fa44e134ee161cd8a3158657 (diff) | |
Merge upstream changes to vertices, and also add Xv attributes for textured video, including bicubic filtering.
Diffstat (limited to 'src/radeon_video.c')
| -rw-r--r-- | src/radeon_video.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c index 4f71e28a..46a2e551 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -106,7 +106,6 @@ static Atom xvEncoding, xvFrequency, xvVolume, xvMute, static Atom xvOvAlpha, xvGrAlpha, xvAlphaMode; - #define GET_PORT_PRIVATE(pScrn) \ (RADEONPortPrivPtr)((RADEONPTR(pScrn))->adaptor->pPortPrivates[0].ptr) @@ -1703,9 +1702,6 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn, Bool setAlpha = FALSE; unsigned char *RADEONMMIO = info->MMIO; - if (pPriv->textured) - return BadMatch; - RADEON_SYNC(info, pScrn); #define RTFSaturation(a) (1.0 + ((a)*1.0)/1000.0) @@ -1932,7 +1928,7 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn, if(pPriv->fi1236!=NULL){ xf86_fi1236_dump_status(pPriv->fi1236); } - } + } else if(attribute == xvAdjustment) { pPriv->adjustment=value; @@ -1977,9 +1973,6 @@ RADEONGetPortAttribute(ScrnInfoPtr pScrn, RADEONInfoPtr info = RADEONPTR(pScrn); RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data; - if (pPriv->textured) - return BadMatch; - if (info->accelOn) RADEON_SYNC(info, pScrn); if(attribute == xvAutopaintColorkey) |