diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 08:26:16 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2008-08-25 08:26:16 -0400 |
| commit | 01daef0f095fbbaee701d5fe97f3dd7838b5f915 (patch) | |
| tree | a953ba17c5edb129f513e8a0f466c762e164f4dc /src/radeon_textured_video.c | |
| parent | 0a51d08c24af040fe48690662b1a912acad51700 (diff) | |
Additional cleanups and re-arragement following bicubic merge
Diffstat (limited to 'src/radeon_textured_video.c')
| -rw-r--r-- | src/radeon_textured_video.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index 8162281e..da1d60f4 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -342,7 +342,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = static XF86AttributeRec Attributes[NUM_ATTRIBUTES+1] = { - {XvSettable | XvGettable, -1, 1, "XV_BICUBIC"}, + {XvSettable | XvGettable, 0, 1, "XV_BICUBIC"}, {0, 0, 0, NULL} }; @@ -389,9 +389,7 @@ RADEONSetTexPortAttribute(ScrnInfoPtr pScrn, RADEON_SYNC(info, pScrn); if (attribute == xvBicubic) - /* -1 -> set default */ - pPriv->bicubic_enabled = (value == -1) ? - (info->ChipFamily >= CHIP_FAMILY_RV515) : value; + pPriv->bicubic_enabled = ClipValue (value, 0, 1); else return BadMatch; @@ -431,8 +429,13 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen) pPortPriv = (RADEONPortPrivPtr)(&adapt->pPortPrivates[num_texture_ports]); - adapt->nAttributes = NUM_ATTRIBUTES; - adapt->pAttributes = Attributes; + if (IS_R500_3D) { + adapt->nAttributes = NUM_ATTRIBUTES; + adapt->pAttributes = Attributes; + } else { + adapt->nAttributes = 0; + adapt->pAttributes = NULL; + } adapt->pImages = Images; adapt->nImages = NUM_IMAGES; adapt->PutVideo = NULL; |