Skip to content

Commit

Permalink
Optimize also 320x240 modes
Browse files Browse the repository at this point in the history
  • Loading branch information
viti95 committed Oct 2, 2024
1 parent 53a638a commit b1ce11b
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions FASTDOOM/r_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnDirect;
Expand Down Expand Up @@ -1543,14 +1543,14 @@ void R_ExecuteSetViewSize(void)
case UMC_GREEN_486:
case CYRIX_5X86:
case AMD_K5:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnSkyFullDirect : R_DrawColumnFastLEA;
#else
skyfunc = R_DrawColumnFastLEA;
#endif
break;
default:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnSkyFullDirect : R_DrawColumn;
#else
skyfunc = R_DrawColumn;
Expand Down Expand Up @@ -1625,7 +1625,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnLowDirect;
Expand Down Expand Up @@ -1709,14 +1709,14 @@ void R_ExecuteSetViewSize(void)
case UMC_GREEN_486:
case CYRIX_5X86:
case AMD_K5:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnLowSkyFullDirect : R_DrawColumnLowFastLEA;
#else
skyfunc = R_DrawColumnLowFastLEA;
#endif
break;
default:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnLowSkyFullDirect : R_DrawColumnLow;
#else
skyfunc = R_DrawColumnLow;
Expand Down Expand Up @@ -1792,7 +1792,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnPotatoDirect;
Expand Down Expand Up @@ -1876,14 +1876,14 @@ void R_ExecuteSetViewSize(void)
case UMC_GREEN_486:
case CYRIX_5X86:
case AMD_K5:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnPotatoSkyFullDirect : R_DrawColumnPotatoFastLEA;
#else
skyfunc = R_DrawColumnPotatoFastLEA;
#endif
break;
default:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnPotatoSkyFullDirect : R_DrawColumnPotato;
#else
skyfunc = R_DrawColumnPotato;
Expand Down Expand Up @@ -1963,7 +1963,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnBackbufferDirect;
Expand Down Expand Up @@ -2047,14 +2047,14 @@ void R_ExecuteSetViewSize(void)
case UMC_GREEN_486:
case CYRIX_5X86:
case AMD_K5:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnBackbufferSkyFullDirect : R_DrawColumnBackbufferFastLEA;
#else
skyfunc = R_DrawColumnBackbufferFastLEA;
#endif
break;
default:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnBackbufferSkyFullDirect : R_DrawColumnBackbuffer;
#else
skyfunc = R_DrawColumnBackbuffer;
Expand Down Expand Up @@ -2129,7 +2129,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnLowBackbufferDirect;
Expand Down Expand Up @@ -2213,14 +2213,14 @@ void R_ExecuteSetViewSize(void)
case UMC_GREEN_486:
case CYRIX_5X86:
case AMD_K5:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnLowBackbufferSkyFullDirect : R_DrawColumnLowBackbufferFastLEA;
#else
skyfunc = R_DrawColumnLowBackbufferFastLEA;
#endif
break;
default:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnLowBackbufferSkyFullDirect : R_DrawColumnLowBackbuffer;
#else
skyfunc = R_DrawColumnLowBackbuffer;
Expand Down Expand Up @@ -2275,7 +2275,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnPotatoBackbufferDirect;
Expand Down Expand Up @@ -2334,7 +2334,7 @@ void R_ExecuteSetViewSize(void)
else
{
drawSky = R_DrawSky;
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnPotatoBackbufferSkyFullDirect : R_DrawColumnPotatoBackbuffer;
#else
skyfunc = R_DrawColumnPotatoBackbuffer;
Expand Down Expand Up @@ -2394,7 +2394,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnVBE2Direct;
Expand Down Expand Up @@ -2453,7 +2453,7 @@ void R_ExecuteSetViewSize(void)
else
{
drawSky = R_DrawSky;
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnVBE2SkyFullDirect : R_DrawColumnVBE2;
#else
skyfunc = R_DrawColumnVBE2;
Expand Down Expand Up @@ -2506,7 +2506,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnLowVBE2Direct;
Expand Down Expand Up @@ -2565,7 +2565,7 @@ void R_ExecuteSetViewSize(void)
else
{
drawSky = R_DrawSky;
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnLowVBE2SkyFullDirect : R_DrawColumnLowVBE2;
#else
skyfunc = R_DrawColumnLowVBE2;
Expand Down Expand Up @@ -2618,7 +2618,7 @@ void R_ExecuteSetViewSize(void)
switch (pspriteRender)
{
case PSPRITE_NORMAL:
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
if (screenblocks >= 10)
{
pspritefunc = basepspritefunc = R_DrawColumnPotatoVBE2Direct;
Expand Down Expand Up @@ -2677,7 +2677,7 @@ void R_ExecuteSetViewSize(void)
else
{
drawSky = R_DrawSky;
#if SCREENHEIGHT == 200
#if SCREENHEIGHT == 200 || SCREENHEIGHT == 240
skyfunc = (screenblocks >= 10) ? R_DrawColumnPotatoVBE2SkyFullDirect : R_DrawColumnPotatoVBE2;
#else
skyfunc = R_DrawColumnPotatoVBE2;
Expand Down

0 comments on commit b1ce11b

Please sign in to comment.