thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize Picture_GetPatchPixel

Browse source
This commit is contained in:
Jaime Ita Passos 2020-12-19 17:32:45 -03:00 • committed by toaster
parent f674737898
commit 96edcff902
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/r_picformats.c
View file

@ -541,9 +541,7 @@ void *Picture_GetPatchPixel(
{ {
fixed_t ofs; fixed_t ofs;
column_t *column; column_t *column;
UINT8 *s8 = NULL; INT32 inbpp = Picture_FormatBPP(informat);
UINT16 *s16 = NULL;
UINT32 *s32 = NULL;
softwarepatch_t *doompatch = (softwarepatch_t *)patch; softwarepatch_t *doompatch = (softwarepatch_t *)patch;
boolean isdoompatch = Picture_IsDoomPatchFormat(informat); boolean isdoompatch = Picture_IsDoomPatchFormat(informat);
INT16 width; INT16 width;
@ -567,30 +565,36 @@ void *Picture_GetPatchPixel(
while (column->topdelta != 0xff) while (column->topdelta != 0xff)
{ {
UINT8 *s8 = NULL;
UINT16 *s16 = NULL;
UINT32 *s32 = NULL;
topdelta = column->topdelta; topdelta = column->topdelta;
if (topdelta <= prevdelta) if (topdelta <= prevdelta)
topdelta += prevdelta; topdelta += prevdelta;
prevdelta = topdelta; prevdelta = topdelta;
s8 = (UINT8 *)(column) + 3;
if (Picture_FormatBPP(informat) == PICDEPTH_32BPP) ofs = (y - topdelta);
s32 = (UINT32 *)s8;
else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP) if (y >= topdelta && ofs < column->length)
s16 = (UINT16 *)s8;
for (ofs = 0; ofs < column->length; ofs++)
{ {
if ((topdelta + ofs) == y) s8 = (UINT8 *)(column) + 3;
switch (inbpp)
{ {
if (Picture_FormatBPP(informat) == PICDEPTH_32BPP) case PICDEPTH_32BPP:
s32 = (UINT32 *)s8;
return &s32[ofs]; return &s32[ofs];
else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP) case PICDEPTH_16BPP:
s16 = (UINT16 *)s8;
return &s16[ofs]; return &s16[ofs];
else // PICDEPTH_8BPP default: // PICDEPTH_8BPP
return &s8[ofs]; return &s8[ofs];
} }
} }
if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
if (inbpp == PICDEPTH_32BPP)
column = (column_t *)((UINT32 *)column + column->length); column = (column_t *)((UINT32 *)column + column->length);
else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP) else if (inbpp == PICDEPTH_16BPP)
column = (column_t *)((UINT16 *)column + column->length); column = (column_t *)((UINT16 *)column + column->length);
else else
column = (column_t *)((UINT8 *)column + column->length); column = (column_t *)((UINT8 *)column + column->length);