comparison vidix/s3_vid.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents df448e1248b2
children 914208d188b9
comparison
equal deleted inserted replaced
29262:7d545a6b8aff 29263:0f1b5b68af32
39 39
40 #include "s3_regs.h" 40 #include "s3_regs.h"
41 41
42 static void S3SetColorKeyOld (void); 42 static void S3SetColorKeyOld (void);
43 static void S3SetColorKeyNew (void); 43 static void S3SetColorKeyNew (void);
44 static void S3SetColorKey2000 (void); 44 static void S3SetColorKey2000 (void);
45 static void (*S3SetColorKey) (void) = NULL; 45 static void (*S3SetColorKey) (void) = NULL;
46 46
47 static void S3SetColorOld (void); 47 static void S3SetColorOld (void);
48 static void S3SetColorNew (void); 48 static void S3SetColorNew (void);
49 static void S3SetColor2000 (void); 49 static void S3SetColor2000 (void);
50 static void (*S3SetColor) (void) = NULL; 50 static void (*S3SetColor) (void) = NULL;
51 51
52 static void S3DisplayVideoOld (void); 52 static void S3DisplayVideoOld (void);
53 static void S3DisplayVideoNew (void); 53 static void S3DisplayVideoNew (void);
54 static void S3DisplayVideo2000 (void); 54 static void S3DisplayVideo2000 (void);
303 if (info->chip.arch <= S3_VIRGE) 303 if (info->chip.arch <= S3_VIRGE)
304 { 304 {
305 ssControl = ((info->src_w - 1) << 1) - ((info->drw_w - 1) & 0xffff); 305 ssControl = ((info->src_w - 1) << 1) - ((info->drw_w - 1) & 0xffff);
306 ssControl |= GetBlendForFourCC (info->format) << 24; 306 ssControl |= GetBlendForFourCC (info->format) << 24;
307 if (info->src_w != info->drw_w) 307 if (info->src_w != info->drw_w)
308 ssControl |= 2 << 28; 308 ssControl |= 2 << 28;
309 309
310 OUTREG (SSTREAM_CONTROL_REG, ssControl); 310 OUTREG (SSTREAM_CONTROL_REG, ssControl);
311 OUTREG (SSTREAM_STRETCH_REG, (((info->src_w - info->drw_w) & 0x7ff) << 16) | (info->src_w - 1)); 311 OUTREG (SSTREAM_STRETCH_REG, (((info->src_w - info->drw_w) & 0x7ff) << 16) | (info->src_w - 1));
312 /* Calculate vertical scale factor */ 312 /* Calculate vertical scale factor */
313 OUTREG (K1_VSCALE_REG, info->src_h - 1); 313 OUTREG (K1_VSCALE_REG, info->src_h - 1);
656 case S3_SAVAGE3D: 656 case S3_SAVAGE3D:
657 videoRam = RamSavage3D[(cr36 & 0xC0) >> 6] * 1024; 657 videoRam = RamSavage3D[(cr36 & 0xC0) >> 6] * 1024;
658 break; 658 break;
659 659
660 case S3_SAVAGE4: 660 case S3_SAVAGE4:
661 /* 661 /*
662 * The Savage4 has one ugly special case to consider. On 662 * The Savage4 has one ugly special case to consider. On
663 * systems with 4 banks of 2Mx32 SDRAM, the BIOS says 4MB 663 * systems with 4 banks of 2Mx32 SDRAM, the BIOS says 4MB
664 * when it really means 8MB. Why do it the same when you 664 * when it really means 8MB. Why do it the same when you
665 * can do it different... 665 * can do it different...
666 */ 666 */
724 724
725 static int is_supported_fourcc (uint32_t fourcc) 725 static int is_supported_fourcc (uint32_t fourcc)
726 { 726 {
727 switch (fourcc) 727 switch (fourcc)
728 { 728 {
729 //FIXME: Burst Command Interface should be used 729 //FIXME: Burst Command Interface should be used
730 // for planar to packed conversion 730 // for planar to packed conversion
731 // case IMGFMT_YV12: 731 // case IMGFMT_YV12:
732 // case IMGFMT_I420: 732 // case IMGFMT_I420:
733 case IMGFMT_UYVY: 733 case IMGFMT_UYVY:
734 case IMGFMT_YUY2: 734 case IMGFMT_YUY2: