Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

StretchBlt:

Browse source 
- Enable unsupported bit depth dprint (4bpp)
- Respect the destination offset instead of always starting the blt at 0,0 (8/16bpp)
- Adapt routine from 8/16/32bpp, tested to be approx 15-25% faster than the old one (24bpp)

svn path=/trunk/; revision=37168
This commit is contained in:
Gregor Schneider 2008-11-03 12:40:24 +00:00
parent bc1f150d78
commit 3e1f229f1c
4 changed files with 189 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

20
reactos/subsystems/win32/win32k/dib/dib16bpp.c
View file

@ -788,12 +788,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_1BPP_GetPixel(SourceSurf, sx, sy)); DIB_1BPP_GetPixel(SourceSurf, sx, sy));
@ -823,12 +823,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_4BPP_GetPixel(SourceSurf, sx, sy)); DIB_4BPP_GetPixel(SourceSurf, sx, sy));
@ -858,12 +858,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_8BPP_GetPixel(SourceSurf, sx, sy)); DIB_8BPP_GetPixel(SourceSurf, sx, sy));
@ -894,12 +894,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_24BPP_GetPixel(SourceSurf, sx, sy)); DIB_24BPP_GetPixel(SourceSurf, sx, sy));
@ -929,12 +929,12 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_32BPP_GetPixel(SourceSurf, sx, sy)); DIB_32BPP_GetPixel(SourceSurf, sx, sy));

205
reactos/subsystems/win32/win32k/dib/dib24bpp.c
View file

@ -414,20 +414,50 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
LONG SrcSizeX; LONG SrcSizeX;
LONG DesSizeY; LONG DesSizeY;
LONG DesSizeX; LONG DesSizeX;
LONG sx; LONG sx = 0;
LONG sy; LONG sy = 0;
LONG DesX; LONG DesX;
LONG DesY; LONG DesY;
LONG color;
LONG SrcZoomXHight;
LONG SrcZoomXLow;
LONG SrcZoomYHight;
LONG SrcZoomYLow;
LONG sy_dec = 0;
LONG sy_max;
LONG sx_dec = 0;
LONG sx_max;
ULONG color;
DPRINT("DIB_24BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", DPRINT("DIB_24BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n",
BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom,
DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); DestRect->left, DestRect->top, DestRect->right, DestRect->bottom);
SrcSizeY = SourceRect->bottom - SourceRect->top;
SrcSizeX = SourceRect->right - SourceRect->left; /* Calc the Zoom height of Source */
SrcSizeY = SourceRect->bottom - SourceRect->top;
DesSizeY = DestRect->bottom - DestRect->top; /* Calc the Zoom Width of Source */
DesSizeX = DestRect->right - DestRect->left; SrcSizeX = SourceRect->right - SourceRect->left;
/* Calc the Zoom height of Destinations */
DesSizeY = DestRect->bottom - DestRect->top;
/* Calc the Zoom width of Destinations */
DesSizeX = DestRect->right - DestRect->left;
/* Calc the zoom factor of source height */
SrcZoomYHight = SrcSizeY / DesSizeY;
SrcZoomYLow = SrcSizeY - (SrcZoomYHight * DesSizeY);
/* Calc the zoom factor of source width */
SrcZoomXHight = SrcSizeX / DesSizeX;
SrcZoomXLow = SrcSizeX - (SrcZoomXHight * DesSizeX);
sx_max = DesSizeX;
sy_max = DesSizeY;
sy = SourceRect->top;
switch(SourceSurf->iBitmapFormat) switch(SourceSurf->iBitmapFormat)
{ {
@ -437,20 +467,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; color = XLATEOBJ_iXlate(ColorTranslation,
DIB_1BPP_GetPixel(SourceSurf, sx, sy));
if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color);
{
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); sx += SrcZoomXHight;
} sx_dec += SrcZoomXLow;
else if (sx_dec >= sx_max)
{ {
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); sx++;
} sx_dec -= sx_max;
}
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
} }
} }
@ -462,13 +503,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; color = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); DIB_4BPP_GetPixel(SourceSurf, sx, sy));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
} }
} }
break; break;
@ -479,13 +538,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; color = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); DIB_8BPP_GetPixel(SourceSurf, sx, sy));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
} }
} }
break; break;
@ -496,13 +573,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; color = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); DIB_16BPP_GetPixel(SourceSurf, sx, sy));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
} }
} }
break; break;
@ -513,13 +608,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; color = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); DIB_24BPP_GetPixel(SourceSurf, sx, sy));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
} }
} }
break; break;
@ -530,13 +643,31 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; sx = SourceRect->left;
sx_dec = 0;
for (DesX=DestRect->left; DesX<DestRect->right; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; color = XLATEOBJ_iXlate(ColorTranslation,
color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); DIB_32BPP_GetPixel(SourceSurf, sx, sy));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color));
DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color);
sx += SrcZoomXHight;
sx_dec += SrcZoomXLow;
if (sx_dec >= sx_max)
{
sx++;
sx_dec -= sx_max;
}
}
sy += SrcZoomYHight;
sy_dec += SrcZoomYLow;
if (sy_dec >= sy_max)
{
sy++;
sy_dec -= sy_max;
} }
} }
break; break;

2
reactos/subsystems/win32/win32k/dib/dib4bpp.c
View file

@ -510,7 +510,7 @@ BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
break; break;
default: default:
//DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat));
return FALSE; return FALSE;
} }

20
reactos/subsystems/win32/win32k/dib/dib8bpp.c
View file

@ -522,11 +522,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
case BMF_1BPP: case BMF_1BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_1BPP_GetPixel(SourceSurf, sx, sy)); DIB_1BPP_GetPixel(SourceSurf, sx, sy));
@ -555,11 +555,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
case BMF_4BPP: case BMF_4BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_4BPP_GetPixel(SourceSurf, sx, sy)); DIB_4BPP_GetPixel(SourceSurf, sx, sy));
@ -593,11 +593,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
case BMF_16BPP: case BMF_16BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_16BPP_GetPixel(SourceSurf, sx, sy)); DIB_16BPP_GetPixel(SourceSurf, sx, sy));
@ -624,11 +624,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
break; break;
case BMF_24BPP: case BMF_24BPP:
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_24BPP_GetPixel(SourceSurf, sx, sy)); DIB_24BPP_GetPixel(SourceSurf, sx, sy));
@ -657,11 +657,11 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
case BMF_32BPP: case BMF_32BPP:
/* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */
/* This is a reference implementation, it hasn't been optimized for speed */ /* This is a reference implementation, it hasn't been optimized for speed */
for (DesY=0; DesY<DesSizeY; DesY++) for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++)
{ {
sx = SourceRect->left; sx = SourceRect->left;
sx_dec = 0; sx_dec = 0;
for (DesX=0; DesX<DesSizeX; DesX++) for (DesX=DestRect->left; DesX<DestRect->right; DesX++)
{ {
color = XLATEOBJ_iXlate(ColorTranslation, color = XLATEOBJ_iXlate(ColorTranslation,
DIB_32BPP_GetPixel(SourceSurf, sx, sy)); DIB_32BPP_GetPixel(SourceSurf, sx, sy));