adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more 2nd phase bilinear scaling optimizations: expanded more, region handling and iteration over region normalized

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1065 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-07-18 16:38:17 +00:00
parent 05c130399f
commit c969ebe7d9
1 changed files with 106 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/2xscalers.c
+106 -104
View File
@@ -2465,31 +2465,30 @@ Scale_BlendPixels_bilinear (BLEND_PARAMS bp, Uint32* p, const Uint32* w)
// bilinear scaling to 2x // bilinear scaling to 2x
void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r) void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
{ {
int x, y, j = 0; int x, y;
const int w = dst->w, h = dst->h; const int w = src->w, h = src->h, dw = dst->w;
int drx, dry;
int xend, yend; int xend, yend;
int dsrc, ddst; int dsrc, ddst;
SDL_Rect *region = r; SDL_Rect *region = r;
SDL_Rect limits; SDL_Rect limits;
SDL_PixelFormat *fmt = dst->format; SDL_PixelFormat *fmt = dst->format;
BLEND_PARAMS blend16; BLEND_PARAMS blend16;
Uint32 p[4]; // influential pixels array
// expand updated region if necessary // expand updated region if necessary
// pixels neighbooring the updated region may // pixels neighbooring the updated region may
// change as a result of updates // change as a result of updates
limits.x = 0; limits.x = 0;
limits.y = 0; limits.y = 0;
limits.w = src->w; limits.w = w;
limits.h = src->h; limits.h = h;
Scale_ExpandRect (region, 1, &limits); Scale_ExpandRect (region, 1, &limits);
drx = 2 * region->x; xend = region->x + region->w;
dry = 2 * region->y; yend = region->y + region->h;
xend = 2 * (region->x + region->w); dsrc = w - region->w;
yend = 2 * (region->y + region->h); ddst = (dw - region->w) * 2;
dsrc = src->w - region->w;
ddst = 2 * dst->w - 2 * region->w;
// precompute the blending masks and shifts // precompute the blending masks and shifts
Scale_CalcChannelMasks (fmt, 16, &blend16); Scale_CalcChannelMasks (fmt, 16, &blend16);
@@ -2503,13 +2502,12 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
{ {
Uint16 *src_p = (Uint16 *) src->pixels; Uint16 *src_p = (Uint16 *) src->pixels;
Uint16 *dst_p = (Uint16 *) dst->pixels; Uint16 *dst_p = (Uint16 *) dst->pixels;
Uint32 p[4];
// move ptrs to the first updated pixel // move ptrs to the first updated pixel
src_p += src->w * region->y + region->x; src_p += src->w * region->y + region->x;
dst_p += (dst->w * region->y + region->x) * 2; dst_p += (dst->w * region->y + region->x) * 2;
for (y = dry; y < yend; y += 2, dst_p += ddst, src_p += dsrc) for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc)
{ {
p[0] = src_p[0]; p[0] = src_p[0];
if (y < h - 2) if (y < h - 2)
@@ -2517,50 +2515,52 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
else else
p[2] = 0; p[2] = 0;
for (x = drx; x < xend; ++x, ++dst_p) for (x = region->x; x < xend; ++x, ++src_p)
{ {
if (j == 0) if (y < h - 2)
{ {
if (y < h - 2) if (x < w - 2)
{ {
if (x < w - 2) p[1] = src_p[1];
{ p[3] = src_p[src->w + 1];
p[1] = src_p[1];
p[3] = src_p[src->w + 1];
}
else
{
p[1] = 0;
p[3] = 0;
}
} }
else else
{ {
if (x < w - 2) p[1] = 0;
p[1] = src_p[1];
else
p[1] = 0;
p[3] = 0; p[3] = 0;
} }
} }
else
{
if (x < w - 2)
p[1] = src_p[1];
else
p[1] = 0;
p[3] = 0;
}
*dst_p = Scale_BlendPixels_bilinear ( *dst_p = Scale_BlendPixels_bilinear (
blend16, p, bilinear_table[j] blend16, p, bilinear_table[0]
); );
*(dst_p + w) = Scale_BlendPixels_bilinear ( *(dst_p + dw) = Scale_BlendPixels_bilinear (
blend16, p, bilinear_table[j + 1] blend16, p, bilinear_table[1]
); );
if (j == 2) ++dst_p;
{
j = 0; *dst_p = Scale_BlendPixels_bilinear (
src_p++; blend16, p, bilinear_table[2]
p[0] = p[1]; );
p[2] = p[3];
} *(dst_p + dw) = Scale_BlendPixels_bilinear (
else blend16, p, bilinear_table[3]
j = 2; );
++dst_p;
p[0] = p[1];
p[2] = p[3];
} }
} }
@@ -2570,13 +2570,12 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
{ {
PIXEL_24BIT *src_p = (PIXEL_24BIT *) src->pixels; PIXEL_24BIT *src_p = (PIXEL_24BIT *) src->pixels;
PIXEL_24BIT *dst_p = (PIXEL_24BIT *) dst->pixels; PIXEL_24BIT *dst_p = (PIXEL_24BIT *) dst->pixels;
Uint32 p[4];
// move ptrs to the first updated pixel // move ptrs to the first updated pixel
src_p += src->w * region->y + region->x; src_p += src->w * region->y + region->x;
dst_p += (dst->w * region->y + region->x) * 2; dst_p += (dst->w * region->y + region->x) * 2;
for (y = dry; y < yend; y += 2, dst_p += ddst, src_p += dsrc) for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc)
{ {
p[0] = GET_PIX_24BIT (src_p); p[0] = GET_PIX_24BIT (src_p);
if (y < h - 2) if (y < h - 2)
@@ -2584,50 +2583,52 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
else else
p[2] = 0; p[2] = 0;
for (x = drx; x < xend; ++x, ++dst_p) for (x = region->x; x < xend; ++x, ++src_p)
{ {
if (j == 0) if (y < h - 2)
{ {
if (y < h - 2) if (x < w - 2)
{ {
if (x < w - 2) p[1] = GET_PIX_24BIT (src_p + 1);
{ p[3] = GET_PIX_24BIT (src_p + src->w + 1);
p[1] = GET_PIX_24BIT (src_p + 1);
p[3] = GET_PIX_24BIT (src_p + src->w + 1);
}
else
{
p[1] = 0;
p[3] = 0;
}
} }
else else
{ {
if (x < w - 2) p[1] = 0;
p[1] = GET_PIX_24BIT (src_p + 1);
else
p[1] = 0;
p[3] = 0; p[3] = 0;
} }
} }
else
{
if (x < w - 2)
p[1] = GET_PIX_24BIT (src_p + 1);
else
p[1] = 0;
p[3] = 0;
}
SET_PIX_24BIT (dst_p, Scale_BlendPixels_bilinear ( SET_PIX_24BIT (dst_p, Scale_BlendPixels_bilinear (
blend16, p, bilinear_table[j] blend16, p, bilinear_table[0]
)); ));
SET_PIX_24BIT (dst_p + w, Scale_BlendPixels_bilinear ( SET_PIX_24BIT (dst_p + dw, Scale_BlendPixels_bilinear (
blend16, p, bilinear_table[j + 1] blend16, p, bilinear_table[1]
)); ));
if (j == 2) ++dst_p;
{
j = 0; SET_PIX_24BIT (dst_p, Scale_BlendPixels_bilinear (
src_p++; blend16, p, bilinear_table[2]
p[0] = p[1]; ));
p[2] = p[3];
} SET_PIX_24BIT (dst_p + dw, Scale_BlendPixels_bilinear (
else blend16, p, bilinear_table[3]
j = 2; ));
++dst_p;
p[0] = p[1];
p[2] = p[3];
} }
} }
@@ -2637,13 +2638,12 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
{ {
Uint32 *src_p = (Uint32 *) src->pixels; Uint32 *src_p = (Uint32 *) src->pixels;
Uint32 *dst_p = (Uint32 *) dst->pixels; Uint32 *dst_p = (Uint32 *) dst->pixels;
Uint32 p[4];
// move ptrs to the first updated pixel // move ptrs to the first updated pixel
src_p += src->w * region->y + region->x; src_p += src->w * region->y + region->x;
dst_p += (dst->w * region->y + region->x) * 2; dst_p += (dst->w * region->y + region->x) * 2;
for (y = dry; y < yend; y += 2, dst_p += ddst, src_p += dsrc) for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc)
{ {
p[0] = src_p[0]; p[0] = src_p[0];
if (y < h - 2) if (y < h - 2)
@@ -2651,50 +2651,52 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
else else
p[2] = 0; p[2] = 0;
for (x = drx; x < xend; ++x, ++dst_p) for (x = region->x; x < xend; ++x, ++src_p)
{ {
if (j == 0) if (y < h - 2)
{ {
if (y < h - 2) if (x < w - 2)
{ {
if (x < w - 2) p[1] = src_p[1];
{ p[3] = src_p[src->w + 1];
p[1] = src_p[1];
p[3] = src_p[src->w + 1];
}
else
{
p[1] = 0;
p[3] = 0;
}
} }
else else
{ {
if (x < w - 2) p[1] = 0;
p[1] = src_p[1];
else
p[1] = 0;
p[3] = 0; p[3] = 0;
} }
} }
else
{
if (x < w - 2)
p[1] = src_p[1];
else
p[1] = 0;
p[3] = 0;
}
*dst_p = Scale_BlendPixels_bilinear ( *dst_p = Scale_BlendPixels_bilinear (
blend16, p, bilinear_table[j] blend16, p, bilinear_table[0]
); );
*(dst_p + w) = Scale_BlendPixels_bilinear ( *(dst_p + dw) = Scale_BlendPixels_bilinear (
blend16, p, bilinear_table[j + 1] blend16, p, bilinear_table[1]
); );
if (j == 2) ++dst_p;
{
j = 0; *dst_p = Scale_BlendPixels_bilinear (
src_p++; blend16, p, bilinear_table[2]
p[0] = p[1]; );
p[2] = p[3];
} *(dst_p + dw) = Scale_BlendPixels_bilinear (
else blend16, p, bilinear_table[3]
j = 2; );
++dst_p;
p[0] = p[1];
p[2] = p[3];
} }
} }