diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
| commit | 1b368984e8802e9d148af57bda5ba9f5562415ed (patch) | |
| tree | eea7adb5c6c9984f73ea5dd459c5e16e29b5fdaf /src/savage_image.c | |
| parent | 70a541832e31fafcc5c26488992f5bf45812da2e (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
Diffstat (limited to 'src/savage_image.c')
| -rw-r--r-- | src/savage_image.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/savage_image.c b/src/savage_image.c index 8b9605b..9530bff 100644 --- a/src/savage_image.c +++ b/src/savage_image.c @@ -102,7 +102,7 @@ SavageWriteBitmapCPUToScreenColorExpand ( cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP | BCI_CMD_SEND_COLOR | BCI_CMD_CLIP_LR | BCI_CMD_DEST_GBD | BCI_CMD_SRC_MONO; - cmd |= XAACopyROP[rop] << 16; + cmd |= XAAGetCopyROP(rop) << 16; if( bg == -1 ) cmd |= BCI_CMD_SRC_TRANSPARENT; @@ -160,7 +160,7 @@ SavageSetupForImageWrite( | BCI_CMD_CLIP_LR | BCI_CMD_DEST_GBD | BCI_CMD_SRC_COLOR; - cmd |= XAACopyROP[rop] << 16; + cmd |= XAAGetCopyROP(rop) << 16; if( transparency_color != -1 ) cmd |= BCI_CMD_SRC_TRANSPARENT; @@ -181,13 +181,11 @@ void SavageSubsequentImageWriteRect { SavagePtr psav = SAVPTR(pScrn); BCI_GET_PTR; - int count; - count = ((w * pScrn->bitsPerPixel + 31) / 32) * h; - psav->WaitQueue( psav, count ); + psav->WaitQueue( psav, 6 ); BCI_SEND(psav->SavedBciCmd); BCI_SEND(BCI_CLIP_LR(x+skipleft, x+w-1)); - if( psav->SavedBgColor != -1 ) + if( psav->SavedBgColor != 0xffffffff ) BCI_SEND(psav->SavedBgColor); BCI_SEND(BCI_X_Y(x, y)); BCI_SEND(BCI_W_H(w, h)); |