stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove SPANDRAWFUNC_MMX, as it's not needed anymore.

Browse source
This commit is contained in:
Jaime Passos 2019-12-13 19:02:36 -03:00
parent 6720279969
commit a27a225a81
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/r_plane.c
View file

@ -1008,8 +1008,6 @@ void R_DrawSinglePlane(visplane_t *pl)
R_CheckFlatLength(W_LumpLength(levelflat->u.flat.lumpnum)); R_CheckFlatLength(W_LumpLength(levelflat->u.flat.lumpnum));
// Raw flats always have dimensions that are powers-of-two numbers. // Raw flats always have dimensions that are powers-of-two numbers.
ds_powersoftwo = true; ds_powersoftwo = true;
if (spanfunc == spanfuncs[BASEDRAWFUNC])
spanfunc = spanfuncs[SPANDRAWFUNC_MMX];
break; break;
default: default:
switch (type) switch (type)
@ -1032,11 +1030,7 @@ void R_DrawSinglePlane(visplane_t *pl)
} }
// Check if this texture or patch has power-of-two dimensions. // Check if this texture or patch has power-of-two dimensions.
if (R_CheckPowersOfTwo()) if (R_CheckPowersOfTwo())
{
R_CheckFlatLength(ds_flatwidth * ds_flatheight); R_CheckFlatLength(ds_flatwidth * ds_flatheight);
if (spanfunctype == BASEDRAWFUNC)
spanfunctype = SPANDRAWFUNC_MMX;
}
} }
if (light >= LIGHTLEVELS) if (light >= LIGHTLEVELS)

4
src/screen.c
View file

@ -124,7 +124,6 @@ void SCR_SetMode(void)
spanfuncs[SPANDRAWFUNC_SPLAT] = R_DrawSplat_8; spanfuncs[SPANDRAWFUNC_SPLAT] = R_DrawSplat_8;
spanfuncs[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat_8; spanfuncs[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat_8;
spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan_8; spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan_8;
spanfuncs[SPANDRAWFUNC_MMX] = spanfuncs[BASEDRAWFUNC];
#ifndef NOWATER #ifndef NOWATER
spanfuncs[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_8; spanfuncs[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_8;
#endif #endif
@ -140,7 +139,6 @@ void SCR_SetMode(void)
spanfuncs_npo2[SPANDRAWFUNC_SPLAT] = R_DrawSplat_NPO2_8; spanfuncs_npo2[SPANDRAWFUNC_SPLAT] = R_DrawSplat_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat_NPO2_8; spanfuncs_npo2[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_FOG] = NULL; // Not needed spanfuncs_npo2[SPANDRAWFUNC_FOG] = NULL; // Not needed
spanfuncs_npo2[SPANDRAWFUNC_MMX] = NULL; // Same
#ifndef NOWATER #ifndef NOWATER
spanfuncs_npo2[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_NPO2_8; spanfuncs_npo2[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_NPO2_8;
#endif #endif
@ -159,7 +157,7 @@ void SCR_SetMode(void)
//colfuncs[COLDRAWFUNC_SHADE] = R_DrawShadeColumn_8_ASM; //colfuncs[COLDRAWFUNC_SHADE] = R_DrawShadeColumn_8_ASM;
//colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn_8_ASM; //colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn_8_ASM;
colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn_8_MMX; colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn_8_MMX;
spanfuncs[SPANDRAWFUNC_MMX] = R_DrawSpan_8_MMX; spanfuncs[BASEDRAWFUNC] = R_DrawSpan_8_MMX;
} }
else else
{ {

1
src/screen.h
View file

@ -133,7 +133,6 @@ extern void (*colfuncs[COLDRAWFUNC_MAX])(void);
enum enum
{ {
SPANDRAWFUNC_BASE = BASEDRAWFUNC, SPANDRAWFUNC_BASE = BASEDRAWFUNC,
SPANDRAWFUNC_MMX,
SPANDRAWFUNC_TRANS, SPANDRAWFUNC_TRANS,
SPANDRAWFUNC_SPLAT, SPANDRAWFUNC_SPLAT,
SPANDRAWFUNC_TRANSSPLAT, SPANDRAWFUNC_TRANSSPLAT,