Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-18 16:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

implemented TransparentBlt() on 16bpp and 24bpp surfaces

Browse source 
svn path=/trunk/; revision=8993
This commit is contained in:
Thomas Bluemel 2004-04-06 21:53:48 +00:00
parent 409aaad5d5
commit 95057e2cf7
9 changed files with 120 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/win32k/dib/dib.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dib.c,v 1.8 2004/04/06 17:54:32 weiden Exp $ */ /* $Id: dib.c,v 1.9 2004/04/06 21:53:48 weiden Exp $ */
#include <windows.h> #include <windows.h>
#include <ddk/winddi.h> #include <ddk/winddi.h>
@ -68,7 +68,7 @@ DIB_GetSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy, XLATE
} }
ULONG ULONG
DIB_GetOriginalSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy) DIB_GetSourceIndex(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy)
{ {
switch (SourceGDI->BitsPerPixel) switch (SourceGDI->BitsPerPixel)
{ {

2
reactos/subsys/win32k/dib/dib.h
View file

@ -3,7 +3,7 @@ extern unsigned char altnotmask[2];
#define MASK1BPP(x) (1<<(7-((x)&7))) #define MASK1BPP(x) (1<<(7-((x)&7)))
ULONG DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern); ULONG DIB_DoRop(ULONG Rop, ULONG Dest, ULONG Source, ULONG Pattern);
ULONG DIB_GetSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation); ULONG DIB_GetSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy, XLATEOBJ* ColorTranslation);
ULONG DIB_GetOriginalSource(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy); ULONG DIB_GetSourceIndex(SURFOBJ* SourceSurf, SURFGDI* SourceGDI, ULONG sx, ULONG sy);
VOID DIB_1BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c); VOID DIB_1BPP_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c);
ULONG DIB_1BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y); ULONG DIB_1BPP_GetPixel(SURFOBJ* SurfObj, LONG x, LONG y);

62
reactos/subsys/win32k/dib/dib16bpp.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dib16bpp.c,v 1.23 2004/04/06 17:54:32 weiden Exp $ */ /* $Id: dib16bpp.c,v 1.24 2004/04/06 21:53:48 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <stdlib.h> #include <stdlib.h>
@ -283,7 +283,7 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
{ {
ULONG X, Y; ULONG X, Y;
ULONG SourceX, SourceY; ULONG SourceX, SourceY;
ULONG Dest, Source, Pattern = 0; ULONG wd, Dest, Source, Pattern = 0;
PULONG DestBits; PULONG DestBits;
BOOL UsesSource; BOOL UsesSource;
BOOL UsesPattern; BOOL UsesPattern;
@ -333,7 +333,8 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
PatternHeight = PatternObj->sizlBitmap.cy; PatternHeight = PatternObj->sizlBitmap.cy;
} }
} }
wd = ((DestRect->right - DestRect->left) << 1) - DestSurf->lDelta;
RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1); RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1);
SourceY = SourcePoint->y; SourceY = SourcePoint->y;
DestBits = (PULONG)( DestBits = (PULONG)(
@ -394,9 +395,7 @@ DIB_16BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
SourceY++; SourceY++;
DestBits = (PULONG)( DestBits = (PULONG)(
(ULONG_PTR)DestBits - (ULONG_PTR)DestBits - wd);
((DestRect->right - DestRect->left) << 1) +
DestSurf->lDelta);
} }
if (PatternSurface != NULL) if (PatternSurface != NULL)
@ -608,7 +607,56 @@ DIB_16BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint, RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor) XLATEOBJ *ColorTranslation, ULONG iTransColor)
{ {
return FALSE; ULONG X, Y, SourceX, SourceY, Source, wd, Dest;
LONG RoundedRight;
ULONG *DestBits;
RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x1);
SourceY = SourcePoint->y;
DestBits = (ULONG*)(DestSurf->pvScan0 +
(DestRect->left << 1) +
DestRect->top * DestSurf->lDelta);
wd = ((DestRect->right - DestRect->left) << 1) - DestSurf->lDelta;
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
SourceX = SourcePoint->x;
for(X = DestRect->left; X < RoundedRight; X += 2, DestBits++, SourceX += 2)
{
Dest = *DestBits;
Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
if(Source != iTransColor)
{
Dest &= 0xFFFF0000;
Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFF);
}
Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX + 1, SourceY);
if(Source != iTransColor)
{
Dest &= 0xFFFF;
Dest |= (XLATEOBJ_iXlate(ColorTranslation, Source) << 16);
}
*DestBits = Dest;
}
if(X < DestRect->right)
{
Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
if(Source != iTransColor)
{
*((USHORT*)DestBits) = (USHORT)(XLATEOBJ_iXlate(ColorTranslation, Source) << 16);
}
DestBits = (PULONG)((ULONG_PTR)DestBits + 2);
}
SourceY++;
DestBits = (ULONG*)((ULONG_PTR)DestBits - wd);
}
return TRUE;
} }
/* EOF */ /* EOF */

31
reactos/subsys/win32k/dib/dib24bpp.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dib24bpp.c,v 1.19 2004/04/06 17:54:32 weiden Exp $ */ /* $Id: dib24bpp.c,v 1.20 2004/04/06 21:53:48 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <stdlib.h> #include <stdlib.h>
@ -367,7 +367,34 @@ DIB_24BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint, RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor) XLATEOBJ *ColorTranslation, ULONG iTransColor)
{ {
return FALSE; ULONG X, Y, SourceX, SourceY, Source, wd, Dest;
BYTE *DestBits;
SourceY = SourcePoint->y;
DestBits = (BYTE*)(DestSurf->pvScan0 +
(DestRect->left << 2) +
DestRect->top * DestSurf->lDelta);
wd = ((DestRect->right - DestRect->left) << 2) - DestSurf->lDelta;
for(Y = DestRect->top; Y < DestRect->bottom; Y++)
{
SourceX = SourcePoint->x;
for(X = DestRect->left; X < DestRect->right; X++, DestBits += 3, SourceX++)
{
Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
if(Source != iTransColor)
{
Dest = XLATEOBJ_iXlate(ColorTranslation, Source) & 0xFFFFFF;
*(PUSHORT)(DestBits) = Dest & 0xFFFF;
*(DestBits + 2) = Dest >> 16;
}
}
SourceY++;
DestBits = (BYTE*)((ULONG_PTR)DestBits - wd);
}
return TRUE;
} }
/* EOF */ /* EOF */

23
reactos/subsys/win32k/dib/dib32bpp.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dib32bpp.c,v 1.19 2004/04/06 17:54:32 weiden Exp $ */ /* $Id: dib32bpp.c,v 1.20 2004/04/06 21:53:48 weiden Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <stdlib.h> #include <stdlib.h>
@ -572,12 +572,11 @@ DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
RECTL* DestRect, POINTL *SourcePoint, RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor) XLATEOBJ *ColorTranslation, ULONG iTransColor)
{ {
ULONG X, Y; ULONG X, Y, SourceX, SourceY, Source, wd;
ULONG SourceX, SourceY, Source, wd; ULONG *DestBits;
PULONG DestBits;
SourceY = SourcePoint->y; SourceY = SourcePoint->y;
DestBits = (PULONG)(DestSurf->pvScan0 + DestBits = (ULONG*)(DestSurf->pvScan0 +
(DestRect->left << 2) + (DestRect->left << 2) +
DestRect->top * DestSurf->lDelta); DestRect->top * DestSurf->lDelta);
wd = ((DestRect->right - DestRect->left) << 2) - DestSurf->lDelta; wd = ((DestRect->right - DestRect->left) << 2) - DestSurf->lDelta;
@ -587,21 +586,15 @@ DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
SourceX = SourcePoint->x; SourceX = SourcePoint->x;
for(X = DestRect->left; X < DestRect->right; X++, DestBits++, SourceX++) for(X = DestRect->left; X < DestRect->right; X++, DestBits++, SourceX++)
{ {
Source = DIB_GetOriginalSource(SourceSurf, SourceGDI, SourceX, SourceY); Source = DIB_GetSourceIndex(SourceSurf, SourceGDI, SourceX, SourceY);
if(Source == iTransColor) if(Source != iTransColor)
{ {
/* Skip transparent pixels */
continue;
}
if(ColorTranslation)
*DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source);
else }
*DestBits = Source;
} }
SourceY++; SourceY++;
DestBits = (PULONG)((ULONG_PTR)DestBits - wd); DestBits = (ULONG*)((ULONG_PTR)DestBits - wd);
} }
return TRUE; return TRUE;

4
reactos/subsys/win32k/eng/bitblt.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: bitblt.c,v 1.44 2004/04/05 21:26:24 navaraf Exp $ /* $Id: bitblt.c,v 1.45 2004/04/06 21:53:48 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -46,8 +46,6 @@
#define NDEBUG #define NDEBUG
#include <win32k/debug1.h> #include <win32k/debug1.h>
#define ROP_NOOP 0x00AA0029
typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
SURFGDI* OutputGDI, SURFGDI* OutputGDI,
SURFOBJ* InputObj, SURFOBJ* InputObj,

7
reactos/subsys/win32k/eng/gradient.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: gradient.c,v 1.6 2004/03/21 10:18:33 weiden Exp $ /* $Id: gradient.c,v 1.7 2004/04/06 21:53:48 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -30,6 +30,7 @@
#include <ddk/winddi.h> #include <ddk/winddi.h>
#include <ddk/ntddmou.h> #include <ddk/ntddmou.h>
#include <include/eng.h> #include <include/eng.h>
#include <include/inteng.h>
#include <include/object.h> #include <include/object.h>
#include <include/paint.h> #include <include/paint.h>
#include <include/surface.h> #include <include/surface.h>
@ -570,13 +571,13 @@ IntEngGradientFill(
{ {
IntLockGDIDriver(SurfGDI); IntLockGDIDriver(SurfGDI);
SurfGDI->BitBlt(psoDest, NULL, NULL, pco, pxlo, SurfGDI->BitBlt(psoDest, NULL, NULL, pco, pxlo,
prclExtents, pptlDitherOrg, NULL, NULL, NULL, 0x00AA0029); prclExtents, pptlDitherOrg, NULL, NULL, NULL, ROP_NOOP);
IntUnLockGDIDriver(SurfGDI); IntUnLockGDIDriver(SurfGDI);
MouseSafetyOnDrawEnd(psoDest, SurfGDI); MouseSafetyOnDrawEnd(psoDest, SurfGDI);
return TRUE; return TRUE;
} }
EngBitBlt(psoDest, NULL, NULL, pco, pxlo, EngBitBlt(psoDest, NULL, NULL, pco, pxlo,
prclExtents, pptlDitherOrg, NULL, NULL, NULL, 0x00AA0029); prclExtents, pptlDitherOrg, NULL, NULL, NULL, ROP_NOOP);
} }
MouseSafetyOnDrawEnd(psoDest, SurfGDI); MouseSafetyOnDrawEnd(psoDest, SurfGDI);
return Ret; return Ret;

20
reactos/subsys/win32k/eng/transblt.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: transblt.c,v 1.14 2004/04/06 17:54:32 weiden Exp $ /* $Id: transblt.c,v 1.15 2004/04/06 21:53:48 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -152,7 +152,7 @@ EngTransparentBlt(PSURFOBJ Dest,
Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
Ret = OutputGDI->DIB_TransparentBlt(OutputObj, InputObj, OutputGDI, InputGDI, &CombinedRect, Ret = OutputGDI->DIB_TransparentBlt(OutputObj, InputObj, OutputGDI, InputGDI, &CombinedRect,
&Pt, ColorTranslation, iTransColor); &Pt, ColorTranslation, iTransColor);
break; break;
} }
case DC_COMPLEX: case DC_COMPLEX:
@ -285,6 +285,22 @@ IntEngTransparentBlt(PSURFOBJ Dest,
SourceRect, iTransColor, Reserved); SourceRect, iTransColor, Reserved);
} }
if(Ret)
{
/* Dummy BitBlt to let driver know that something has changed.
0x00AA0029 is the Rop for D (no-op) */
if(SurfGDIDest->BitBlt)
{
IntLockGDIDriver(SurfGDIDest);
SurfGDIDest->BitBlt(Dest, NULL, NULL, Clip, ColorTranslation,
&OutputRect, NULL, NULL, NULL, NULL, ROP_NOOP);
IntUnLockGDIDriver(SurfGDIDest);
}
else
EngBitBlt(Dest, NULL, NULL, Clip, ColorTranslation,
&OutputRect, NULL, NULL, NULL, NULL, ROP_NOOP);
}
MouseSafetyOnDrawEnd(Dest, SurfGDIDest); MouseSafetyOnDrawEnd(Dest, SurfGDIDest);
if(Source != Dest) if(Source != Dest)
{ {

2
reactos/subsys/win32k/include/inteng.h
View file

@ -1,6 +1,8 @@
#ifndef _WIN32K_INTENG_H #ifndef _WIN32K_INTENG_H
#define _WIN32K_INTENG_H #define _WIN32K_INTENG_H
#define ROP_NOOP 0x00AA0029
/* Definitions of IntEngXxx functions */ /* Definitions of IntEngXxx functions */
BOOL STDCALL IntEngLineTo(SURFOBJ *Surface, BOOL STDCALL IntEngLineTo(SURFOBJ *Surface,