frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive: dont touch hardware when disabled

This commit is contained in:
Keith Packard 2001-06-29 13:55:53 +00:00
parent 01a53daa03
commit 63dd090655
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/kdrive/src/kaa.c
View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.3 2001/06/03 18:48:19 keithp Exp $ * $XFree86: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.4 2001/06/04 09:45:41 keithp Exp $
* *
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
* *
@ -35,7 +35,9 @@ void
kaaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n, kaaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
DDXPointPtr ppt, int *pwidth, int fSorted) DDXPointPtr ppt, int *pwidth, int fSorted)
{ {
KaaScreenPriv (pDrawable->pScreen); ScreenPtr pScreen = pDrawable->pScreen;
KdScreenPriv (pScreen);
KaaScreenPriv (pScreen);
RegionPtr pClip = fbGetCompositeClip(pGC); RegionPtr pClip = fbGetCompositeClip(pGC);
BoxPtr pextent, pbox; BoxPtr pextent, pbox;
int nbox; int nbox;
@ -43,7 +45,8 @@ kaaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
int fullX1, fullX2, fullY1; int fullX1, fullX2, fullY1;
int partX1, partX2; int partX1, partX2;
if (pGC->fillStyle != FillSolid || if (!pScreenPriv->enabled ||
pGC->fillStyle != FillSolid ||
!(*pKaaScr->PrepareSolid) (pDrawable, !(*pKaaScr->PrepareSolid) (pDrawable,
pGC->alu, pGC->alu,
pGC->planemask, pGC->planemask,
@ -120,6 +123,7 @@ kaaCopyNtoN (DrawablePtr pSrcDrawable,
Pixel bitplane, Pixel bitplane,
void *closure) void *closure)
{ {
KdScreenPriv (pDstDrawable->pScreen);
KaaScreenPriv (pDstDrawable->pScreen); KaaScreenPriv (pDstDrawable->pScreen);
int srcX, srcY, dstX, dstY; int srcX, srcY, dstX, dstY;
int w, h; int w, h;
@ -127,7 +131,8 @@ kaaCopyNtoN (DrawablePtr pSrcDrawable,
CARD32 cmd; CARD32 cmd;
CARD8 alu; CARD8 alu;
if (pSrcDrawable->type == DRAWABLE_WINDOW && if (pScreenPriv->enabled &&
pSrcDrawable->type == DRAWABLE_WINDOW &&
(*pKaaScr->PrepareCopy) (pSrcDrawable, (*pKaaScr->PrepareCopy) (pSrcDrawable,
pDstDrawable, pDstDrawable,
dx, dx,
@ -170,6 +175,7 @@ kaaPolyFillRect(DrawablePtr pDrawable,
int nrect, int nrect,
xRectangle *prect) xRectangle *prect)
{ {
KdScreenPriv (pDrawable->pScreen);
KaaScreenPriv (pDrawable->pScreen); KaaScreenPriv (pDrawable->pScreen);
RegionPtr pClip = fbGetCompositeClip(pGC); RegionPtr pClip = fbGetCompositeClip(pGC);
register BoxPtr pbox; register BoxPtr pbox;
@ -180,7 +186,8 @@ kaaPolyFillRect(DrawablePtr pDrawable,
int xorg, yorg; int xorg, yorg;
int n; int n;
if (pGC->fillStyle != FillSolid || if (!pScreenPriv->enabled ||
pGC->fillStyle != FillSolid ||
!(*pKaaScr->PrepareSolid) (pDrawable, !(*pKaaScr->PrepareSolid) (pDrawable,
pGC->alu, pGC->alu,
pGC->planemask, pGC->planemask,
@ -269,13 +276,15 @@ kaaSolidBoxClipped (DrawablePtr pDrawable,
int x2, int x2,
int y2) int y2)
{ {
KdScreenPriv (pDrawable->pScreen);
KaaScreenPriv (pDrawable->pScreen); KaaScreenPriv (pDrawable->pScreen);
BoxPtr pbox; BoxPtr pbox;
int nbox; int nbox;
int partX1, partX2, partY1, partY2; int partX1, partX2, partY1, partY2;
CARD32 cmd; CARD32 cmd;
if (!(*pKaaScr->PrepareSolid) (pDrawable, GXcopy, pm, fg)) if (!pScreenPriv->enabled ||
!(*pKaaScr->PrepareSolid) (pDrawable, GXcopy, pm, fg))
{ {
KdCheckSync (pDrawable->pScreen); KdCheckSync (pDrawable->pScreen);
fg = fbReplicatePixel (fg, pDrawable->bitsPerPixel); fg = fbReplicatePixel (fg, pDrawable->bitsPerPixel);
@ -539,9 +548,11 @@ kaaFillRegionSolid (DrawablePtr pDrawable,
RegionPtr pRegion, RegionPtr pRegion,
Pixel pixel) Pixel pixel)
{ {
KdScreenPriv(pDrawable->pScreen);
KaaScreenPriv(pDrawable->pScreen); KaaScreenPriv(pDrawable->pScreen);
if ((*pKaaScr->PrepareSolid) (pDrawable, GXcopy, FB_ALLONES, pixel)) if (pScreenPriv->enabled &&
(*pKaaScr->PrepareSolid) (pDrawable, GXcopy, FB_ALLONES, pixel))
{ {
int nbox = REGION_NUM_RECTS (pRegion); int nbox = REGION_NUM_RECTS (pRegion);
BoxPtr pBox = REGION_RECTS (pRegion); BoxPtr pBox = REGION_RECTS (pRegion);