diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-04-14 11:26:35 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-04-17 10:24:59 -0400 |
| commit | 8810fe92b5aed08888584c6914482586b59f71ab (patch) | |
| tree | eecb9799df28d9ae4e192828c51ffc8d00e383ca /src/radeon_textured_video.c | |
| parent | 17685fefba68d188c7c0fe7a079180ec0722c046 (diff) | |
R200: clean code, always use shader based csc
- consolidate common r2xx csc shader code
- always use shader based csc for both packed and planar
formats
- always use native planar csc on r1xx
Diffstat (limited to 'src/radeon_textured_video.c')
| -rw-r--r-- | src/radeon_textured_video.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index f6575365..82675d9f 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -362,7 +362,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, /* Bicubic filter setup */ pPriv->bicubic_enabled = (pPriv->bicubic_state != BICUBIC_OFF); - if (!(IS_R300_3D || IS_R500_3D || IS_R600_3D)) + if (!(IS_R300_3D || IS_R500_3D)) pPriv->bicubic_enabled = FALSE; if (pPriv->bicubic_enabled && (pPriv->bicubic_state == BICUBIC_AUTO)) { /* @@ -377,6 +377,9 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, if (pPriv->bicubic_enabled || (IS_R600_3D || IS_R500_3D)) pPriv->planar_hw = 0; + if (info->ChipFamily < CHIP_FAMILY_R300) + pPriv->planar_hw = 1; + switch(id) { case FOURCC_YV12: case FOURCC_I420: @@ -663,21 +666,19 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = {15, TrueColor}, {16, TrueColor}, {24, TrueColor} }; -#define NUM_ATTRIBUTES 2 +#define NUM_ATTRIBUTES 1 static XF86AttributeRec Attributes[NUM_ATTRIBUTES+1] = { {XvSettable | XvGettable, 0, 1, "XV_VSYNC"}, - {XvSettable | XvGettable, 0, 1, "XV_HWPLANAR"}, {0, 0, 0, NULL} }; -#define NUM_ATTRIBUTES_R200 7 +#define NUM_ATTRIBUTES_R200 6 static XF86AttributeRec Attributes_r200[NUM_ATTRIBUTES_R200+1] = { {XvSettable | XvGettable, 0, 1, "XV_VSYNC"}, - {XvSettable | XvGettable, 0, 1, "XV_HWPLANAR"}, {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"}, {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"}, {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"}, |