diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:41 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:22:41 +0000 |
| commit | 5f64cbc462a1a841bebe1fa5bae57560a8def42f (patch) | |
| tree | 2e17d880ed5cb486e087f48ee1e01ba013ecf75d /src/apm_video.c | |
| parent | 6003db3c2a88658f9254f1c346ad1960250b30b2 (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/apm_video.c')
| -rw-r--r-- | src/apm_video.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/apm_video.c b/src/apm_video.c index dcaa00b..7107b13 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -1,8 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.11tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.10 2003/04/23 21:51:26 tsi Exp $ */ #if PSZ != 24 #include "dixstruct.h" -#include "fourcc.h" /* * Ported from mga_video.c by Loïc Grenié @@ -116,7 +115,7 @@ static XF86AttributeRec Attributes[NUM_ATTRIBUTES] = {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"} }; -#define NUM_IMAGES 9 +#define NUM_IMAGES 8 typedef char c8; static XF86ImageRec Images[NUM_IMAGES] = @@ -172,7 +171,6 @@ static XF86ImageRec Images[NUM_IMAGES] = 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, XvTopToBottom }, - XVIMAGE_YUY2, { 0x59595959, XvYUV, @@ -340,8 +338,8 @@ A(SetupImageVideo)(ScreenPtr pScreen) pPriv[1].contrast = 128; /* gotta uninit this someplace */ - REGION_NULL(pScreen, &pPriv->clip); - REGION_NULL(pScreen, &(pPriv + 1)->clip); + REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); + REGION_INIT(pScreen, &(pPriv + 1)->clip, NullBox, 0); pApm->adaptor = adapt; @@ -508,7 +506,6 @@ static int A(ReputImage)(ScrnInfoPtr pScrn, short drw_x, short drw_y, RegionPtr clipBoxes, pointer pdata) { - ScreenPtr pScreen = pScrn->pScreen; APMDECL(pScrn); ApmPortPrivPtr pPriv = pdata, pPriv0, pPriv1; register int fx, fy; @@ -537,7 +534,7 @@ A(ReputImage)(ScrnInfoPtr pScrn, short drw_x, short drw_y, reg0 = &pPriv0->clip; bzero(&Union, sizeof Union); REGION_EMPTY(pScreen, &Union); - REGION_NULL(pScreen, &Union); + REGION_INIT(pScreen, &Union, NullBox, 0); REGION_UNION(pScreen, &Union, reg0, &pPriv1->clip); nrects = REGION_NUM_RECTS(&Union); rects = REGION_RECTS(&Union); @@ -929,7 +926,6 @@ ApmQueryImageAttributes(ScrnInfoPtr pScrn, int id, case 0x59565955: case 0x55595659: case 0x59555956: - case 0x32595559: size = *w << 1; goto common; case 0x59595959: |