From e11b3c52fb2991220e59d2c5513be0c46c4401de Mon Sep 17 00:00:00 2001
From: Ronald Kinard <furyhunter600@gmail.com>
Date: Sat, 7 Mar 2015 23:54:02 -0600
Subject: [PATCH] Remove SHUFFLE define.
Honestly, under no circumstances when GL is compiled into the game
should the PostImgRedraw not be available. Removing this helps
make the GL code slightly more readable.
---
src/doomdef.h | 5 -----
src/hardware/hw_drv.h | 4 ----
src/hardware/hw_main.c | 2 --
src/hardware/r_opengl/r_opengl.c | 7 -------
src/sdl/hwsym_sdl.c | 2 --
src/sdl/i_video.c | 2 --
src/sdl12/hwsym_sdl.c | 2 --
src/sdl12/i_video.c | 2 --
src/win32/win_dll.c | 4 ----
9 files changed, 30 deletions(-)
diff --git a/src/doomdef.h b/src/doomdef.h
index 4a6d6e576..122be3d28 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -472,11 +472,6 @@ extern const char *compdate, *comptime, *comprevision;
/// Most modifications should probably enable this.
//#define SAVEGAME_OTHERVERSIONS
-#if !defined (_NDS) && !defined (_PSP)
-/// Shuffle's incomplete OpenGL sorting code.
-#define SHUFFLE // This has nothing to do with sorting, why was it disabled?
-#endif
-
#if !defined (_NDS) && !defined (_PSP)
/// Allow the use of the SOC RESETINFO command.
/// \note Builds that are tight on memory should disable this.
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
index e0c2f3273..188aeff98 100644
--- a/src/hardware/hw_drv.h
+++ b/src/hardware/hw_drv.h
@@ -75,10 +75,8 @@ EXPORT INT32 HWRAPI(GetRenderVersion) (void);
// metzgermeister: added for Voodoo detection
EXPORT char *HWRAPI(GetRenderer) (void);
#endif
-#ifdef SHUFFLE
#define SCREENVERTS 10
EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2]);
-#endif
EXPORT void HWRAPI(StartScreenWipe) (void);
EXPORT void HWRAPI(EndScreenWipe) (void);
EXPORT void HWRAPI(DoScreenWipe) (float alpha);
@@ -121,9 +119,7 @@ struct hwdriver_s
#ifndef HAVE_SDL
Shutdown pfnShutdown;
#endif
-#ifdef SHUFFLE
PostImgRedraw pfnPostImgRedraw;
-#endif
StartScreenWipe pfnStartScreenWipe;
EndScreenWipe pfnEndScreenWipe;
DoScreenWipe pfnDoScreenWipe;
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index db812c0df..549b4ac2a 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5840,7 +5840,6 @@ void HWR_DoPostProcessor(player_t *player)
if (splitscreen) // Not supported in splitscreen - someone want to add support?
return;
-#ifdef SHUFFLE
// Drunken vision! WooOOooo~
if (*type == postimg_water || *type == postimg_heat)
{
@@ -5883,7 +5882,6 @@ void HWR_DoPostProcessor(player_t *player)
HWD.pfnMakeScreenTexture();
}
// Flipping of the screen isn't done here anymore
-#endif // SHUFFLE
}
void HWR_StartScreenWipe(void)
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index 82cd77d87..e9573a589 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -28,11 +28,6 @@
#include <stdarg.h>
#include <math.h>
-#ifndef SHUFFLE
-#ifndef KOS_GL_COMPATIBILITY
-#define SHUFFLE
-#endif
-#endif
#include "r_opengl.h"
#if defined (HWRENDER) && !defined (NOROPENGL)
@@ -1932,7 +1927,6 @@ EXPORT INT32 HWRAPI(GetRenderVersion) (void)
return VERSION;
}
-#ifdef SHUFFLE
EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2])
{
INT32 x, y;
@@ -1992,7 +1986,6 @@ EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2])
pglEnable(GL_DEPTH_TEST);
pglEnable(GL_BLEND);
}
-#endif //SHUFFLE
// Create Screen to fade from
EXPORT void HWRAPI(StartScreenWipe) (void)
diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index 54f5da3a0..1f8700455 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -97,9 +97,7 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(DrawMD2i);
GETFUNC(SetTransform);
GETFUNC(GetRenderVersion);
-#ifdef SHUFFLE
GETFUNC(PostImgRedraw);
-#endif //SHUFFLE
GETFUNC(StartScreenWipe);
GETFUNC(EndScreenWipe);
GETFUNC(DoScreenWipe);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index faee1bc69..0b9452b8c 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1752,9 +1752,7 @@ void I_StartupGraphics(void)
HWD.pfnDrawMD2i = hwSym("DrawMD2i",NULL);
HWD.pfnSetTransform = hwSym("SetTransform",NULL);
HWD.pfnGetRenderVersion = hwSym("GetRenderVersion",NULL);
-#ifdef SHUFFLE
HWD.pfnPostImgRedraw = hwSym("PostImgRedraw",NULL);
-#endif
HWD.pfnStartScreenWipe = hwSym("StartScreenWipe",NULL);
HWD.pfnEndScreenWipe = hwSym("EndScreenWipe",NULL);
HWD.pfnDoScreenWipe = hwSym("DoScreenWipe",NULL);
diff --git a/src/sdl12/hwsym_sdl.c b/src/sdl12/hwsym_sdl.c
index 54f5da3a0..1f8700455 100644
--- a/src/sdl12/hwsym_sdl.c
+++ b/src/sdl12/hwsym_sdl.c
@@ -97,9 +97,7 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(DrawMD2i);
GETFUNC(SetTransform);
GETFUNC(GetRenderVersion);
-#ifdef SHUFFLE
GETFUNC(PostImgRedraw);
-#endif //SHUFFLE
GETFUNC(StartScreenWipe);
GETFUNC(EndScreenWipe);
GETFUNC(DoScreenWipe);
diff --git a/src/sdl12/i_video.c b/src/sdl12/i_video.c
index 197924eda..33925cca8 100644
--- a/src/sdl12/i_video.c
+++ b/src/sdl12/i_video.c
@@ -1969,9 +1969,7 @@ void I_StartupGraphics(void)
HWD.pfnDrawMD2i = hwSym("DrawMD2i",NULL);
HWD.pfnSetTransform = hwSym("SetTransform",NULL);
HWD.pfnGetRenderVersion = hwSym("GetRenderVersion",NULL);
-#ifdef SHUFFLE
HWD.pfnPostImgRedraw = hwSym("PostImgRedraw",NULL);
-#endif
HWD.pfnStartScreenWipe = hwSym("StartScreenWipe",NULL);
HWD.pfnEndScreenWipe = hwSym("EndScreenWipe",NULL);
HWD.pfnDoScreenWipe = hwSym("DoScreenWipe",NULL);
diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c
index 8fa4d17f7..7f9ed002b 100644
--- a/src/win32/win_dll.c
+++ b/src/win32/win_dll.c
@@ -114,9 +114,7 @@ static loadfunc_t hwdFuncTable[] = {
{"SetTransform@4", &hwdriver.pfnSetTransform},
{"GetTextureUsed@0", &hwdriver.pfnGetTextureUsed},
{"GetRenderVersion@0", &hwdriver.pfnGetRenderVersion},
-#ifdef SHUFFLE
{"PostImgRedraw@4", &hwdriver.pfnPostImgRedraw},
-#endif
{"StartScreenWipe@0", &hwdriver.pfnStartScreenWipe},
{"EndScreenWipe@0", &hwdriver.pfnEndScreenWipe},
{"DoScreenWipe@4", &hwdriver.pfnDoScreenWipe},
@@ -144,9 +142,7 @@ static loadfunc_t hwdFuncTable[] = {
{"SetTransform", &hwdriver.pfnSetTransform},
{"GetTextureUsed", &hwdriver.pfnGetTextureUsed},
{"GetRenderVersion", &hwdriver.pfnGetRenderVersion},
-#ifdef SHUFFLE
{"PostImgRedraw", &hwdriver.pfnPostImgRedraw},
-#endif
{"StartScreenWipe", &hwdriver.pfnStartScreenWipe},
{"EndScreenWipe", &hwdriver.pfnEndScreenWipe},
{"DoScreenWipe", &hwdriver.pfnDoScreenWipe},
--
GitLab