From 63171bc9c854f8aeb53a6579a579e5371c5bcf63 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:49:00 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- src/ffb_accel.c | 6 +++--- src/ffb_cplane.c | 44 ++++++++++++++++++++++++++------------------ src/ffb_driver.c | 8 ++++---- src/ffb_gc.c | 4 ++-- 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/src/ffb_accel.c b/src/ffb_accel.c index b8ce88b..9aeb71d 100644 --- a/src/ffb_accel.c +++ b/src/ffb_accel.c @@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.5 2001/03/03 22:41:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.7 2003/11/10 18:22:31 tsi Exp $ */ #include "scrnintstr.h" #include "pixmapstr.h" @@ -148,7 +148,7 @@ CreatorDestroyWindow (WindowPtr pWin) extern CreatorStipplePtr FFB_tmpStipple; static int -CreatorChangeWindowAttributes (WindowPtr pWin, Mask mask) +CreatorChangeWindowAttributes (WindowPtr pWin, unsigned long mask) { FFBPtr pFfb = GET_FFB_FROM_SCREEN(pWin->drawable.pScreen); CreatorPrivWinPtr pFfbPrivWin; @@ -457,7 +457,7 @@ CreatorCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) FFBLOG(("CreatorCopyWindow: WIN(%p)\n", pWin)); - REGION_INIT(pScreen, &rgnDst, NullBox, 0); + REGION_NULL(pScreen, &rgnDst); dx = ptOldOrg.x - pWin->drawable.x; dy = ptOldOrg.y - pWin->drawable.y; diff --git a/src/ffb_cplane.c b/src/ffb_cplane.c index a94b373..6a75d34 100644 --- a/src/ffb_cplane.c +++ b/src/ffb_cplane.c @@ -22,7 +22,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.3 2003/07/19 13:22:29 tsi Exp $ */ #include "ffb.h" #include "ffb_regs.h" @@ -319,9 +319,11 @@ RegionPtr CreatorCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, if (bitPlane == 1) { copyPlaneFG = pGC->fgPixel; copyPlaneBG = pGC->bgPixel; - ret = cfbBitBlt (pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, - dstx, dsty, CreatorCopyPlane1toFbBpp, bitPlane); + ret = cfbCopyPlaneReduce (pSrcDrawable, pDstDrawable, + pGC, srcx, srcy, + width, height, dstx, dsty, + CreatorCopyPlane1toFbBpp, + bitPlane); } else ret = miHandleExposures (pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height, dstx, dsty, bitPlane); @@ -338,13 +340,16 @@ RegionPtr CreatorCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin); FFBWait(pFfb, ffb); if (pSrcDrawable->bitsPerPixel == 32) { - ret = cfbBitBlt (pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, - CreatorCopyPlane32to1, bitPlane); + ret = cfbCopyPlaneReduce (pSrcDrawable, pDstDrawable, + pGC, srcx, srcy, + width, height, dstx, dsty, + CreatorCopyPlane32to1, + bitPlane); } else { - ret = cfbBitBlt (pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, - cfbCopyPlane8to1, bitPlane); + ret = cfbCopyPlaneReduce (pSrcDrawable, pDstDrawable, + pGC, srcx, srcy, + width, height, dstx, dsty, + cfbCopyPlane8to1, bitPlane); } pGC->alu = oldalu; } else { @@ -370,18 +375,21 @@ RegionPtr CreatorCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, FFB_ATTR_SFB_VAR_WIN(pFfb, 0x00ffffff, GXcopy, pWin); FFBWait(pFfb, ffb); if (pSrcDrawable->bitsPerPixel == 32) { - cfbBitBlt (pSrcDrawable, (DrawablePtr) pBitmap, - pGC1, srcx, srcy, width, height, 0, 0, - CreatorCopyPlane32to1, bitPlane); + cfbCopyPlaneReduce (pSrcDrawable, (DrawablePtr) pBitmap, + pGC1, srcx, srcy, width, height, + 0, 0, CreatorCopyPlane32to1, + bitPlane); } else { - cfbBitBlt (pSrcDrawable, (DrawablePtr) pBitmap, - pGC1, srcx, srcy, width, height, 0, 0, - cfbCopyPlane8to1, bitPlane); + cfbCopyPlaneReduce (pSrcDrawable, (DrawablePtr) pBitmap, + pGC1, srcx, srcy, width, height, + 0, 0, cfbCopyPlane8to1, + bitPlane); } copyPlaneFG = pGC->fgPixel; copyPlaneBG = pGC->bgPixel; - cfbBitBlt ((DrawablePtr) pBitmap, pDstDrawable, pGC, - 0, 0, width, height, dstx, dsty, CreatorCopyPlane1toFbBpp, 1); + cfbCopyPlaneReduce ((DrawablePtr) pBitmap, pDstDrawable, pGC, + 0, 0, width, height, dstx, dsty, + CreatorCopyPlane1toFbBpp, 1); FreeScratchGC (pGC1); (*pScreen->DestroyPixmap) (pBitmap); /* compute resultant exposures */ diff --git a/src/ffb_driver.c b/src/ffb_driver.c index 8921955..2178cc8 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c,v 1.11 2002/12/06 02:44:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c,v 1.12 2003/10/30 17:37:12 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -58,8 +58,8 @@ static void FFBAdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void FFBFreeScreen(int scrnIndex, int flags); -static int FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, - int flags); +static ModeStatus FFBValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); static void FFBDPMSMode(ScrnInfoPtr pScrn, int DPMSMode, int flags); /* ffb_dga.c */ extern void FFB_InitDGA(ScreenPtr pScreen); @@ -1078,7 +1078,7 @@ FFBFreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static int +static ModeStatus FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) diff --git a/src/ffb_gc.c b/src/ffb_gc.c index 235f649..59cde91 100644 --- a/src/ffb_gc.c +++ b/src/ffb_gc.c @@ -24,7 +24,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.3 2000/12/01 00:24:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.4 2003/06/23 17:35:48 eich Exp $ */ #include "ffb.h" #include "ffb_regs.h" @@ -444,7 +444,7 @@ CreatorNewFillArea(GCPtr pGC, cfbPrivGCPtr devPriv, CreatorPrivGCPtr gcPriv, int } void -CreatorValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable) +CreatorValidateGC (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { int mask; /* stateChanges */ int new_rrop; -- cgit v1.2.3