lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove duplicate code

Browse source
This commit is contained in:
FunkyFr3sh 2022-09-13 10:18:24 +02:00
parent f4a403f434
commit 5ad539bbb4
1 changed files with 23 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/blt.c
View file

@ -385,7 +385,13 @@ void blt_colorfill(
dst += (dst_x * bytes_pp) + (dst_p * dst_y); dst += (dst_x * bytes_pp) + (dst_p * dst_y);
if (bpp == 8) if (bpp == 8 ||
(bpp == 16 &&
(color & 0xFF) == ((color >> 8) & 0xFF)) ||
(bpp == 32 &&
(color & 0xFF) == ((color >> 8) & 0xFF) &&
(color & 0xFF) == ((color >> 16) & 0xFF) &&
(color & 0xFF) == ((color >> 24) & 0xFF)))
{ {
if (size == dst_p) if (size == dst_p)
{ {
@ -401,23 +407,6 @@ void blt_colorfill(
} }
} }
else if (bpp == 16) else if (bpp == 16)
{
if ((color & 0xFF) == ((color >> 8) & 0xFF))
{
if (size == dst_p)
{
memset(dst, color, dst_p * dst_h);
}
else
{
for (int i = 0; i < dst_h; i++)
{
memset(dst, color, size);
dst += dst_p;
}
}
}
else
{ {
unsigned short* first_row = (unsigned short*)dst; unsigned short* first_row = (unsigned short*)dst;
@ -432,27 +421,7 @@ void blt_colorfill(
memcpy(dst, first_row, size); memcpy(dst, first_row, size);
} }
} }
}
else if (bpp == 32) else if (bpp == 32)
{
if ((color & 0xFF) == ((color >> 8) & 0xFF) &&
(color & 0xFF) == ((color >> 16) & 0xFF) &&
(color & 0xFF) == ((color >> 24) & 0xFF))
{
if (size == dst_p)
{
memset(dst, color, dst_p * dst_h);
}
else
{
for (int i = 0; i < dst_h; i++)
{
memset(dst, color, size);
dst += dst_p;
}
}
}
else
{ {
unsigned int* first_row = (unsigned int*)dst; unsigned int* first_row = (unsigned int*)dst;
@ -468,7 +437,6 @@ void blt_colorfill(
} }
} }
} }
}
void blt_rgb565_to_rgba8888( void blt_rgb565_to_rgba8888(
unsigned int* dst, unsigned int* dst,