diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:29 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:29 +0000 |
| commit | b9a6776bc04eb19343882bddb371b705677cfc14 (patch) | |
| tree | 1a208639fce2ff133b157bf41ad8217f1d1035f2 /src/nv_video.c | |
| parent | cbf040deb0ab24425468ed60b3f3edd322ec210f (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-mergeCOMPOSITEWRAP
Diffstat (limited to 'src/nv_video.c')
| -rw-r--r-- | src/nv_video.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nv_video.c b/src/nv_video.c index 66f49c0..f985461 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.20tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.19 2003/09/01 20:54:26 mvojkovi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -432,7 +432,7 @@ NVSetupOverlayVideo (ScreenPtr pScreen) NVSetPortDefaults (pScrnInfo, pPriv); /* gotta uninit this someplace */ - REGION_NULL(pScreen, &pPriv->clip); + REGION_INIT(pScreen, &pPriv->clip, NullBox, 0); pNv->overlayAdaptor = adapt; @@ -958,7 +958,7 @@ static int NVPutImage NVPtr pNv = NVPTR(pScrnInfo); INT32 xa, xb, ya, yb; unsigned char *dst_start; - int newSize, offset, s2offset, s3offset; + int pitch, newSize, offset, s2offset, s3offset; int srcPitch, srcPitch2, dstPitch; int top, left, right, bottom, npixels, nlines, bpp; Bool skip = FALSE; @@ -1011,6 +1011,7 @@ static int NVPutImage } bpp = pScrnInfo->bitsPerPixel >> 3; + pitch = bpp * pScrnInfo->displayWidth; switch(id) { case FOURCC_YV12: |