Remove lua_udatalib, and use Lua_CreateFieldTable for mobj and player instead

Need to test this a little but in theory, udatalib doesn't really give
much benefits, and using fields table and enum is safer than messing
with offsetof

src/CMakeLists.txt

@@ -292,7 +292,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_script.c
 		lua_skinlib.c
 		lua_thinkerlib.c
-		lua_udatalib.c
 		lua_glib.c
 	)
 	set(SRB2_LUA_HEADERS
@@ -302,7 +301,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
 		lua_profile.h
 		lua_libs.h
 		lua_script.h
-		lua_udatalib.h
 		lua_glib.h
 	)
 

src/Sourcefile

@@ -97,6 +97,5 @@ lua_playerlib.c
 lua_script.c
 lua_skinlib.c
 lua_thinkerlib.c
-lua_udatalib.c
 lua_glib.c
 lua_profile.cpp

src/d_netcmd.c

@@ -1043,8 +1043,6 @@ void D_RegisterClientCommands(void)
 
 		CV_RegisterVar(&cv_rumble[i]);
 		CV_RegisterVar(&cv_rumble_strength[i]);
-
-		CV_RegisterVar(&cv_rumble_wallbonk[i]);
 		CV_RegisterVar(&cv_rumble_spinout[i]);
 		CV_RegisterVar(&cv_rumble_sneakerboost[i]);
 		CV_RegisterVar(&cv_rumble_offroad[i]);

src/g_input.c

@@ -17,9 +17,14 @@
 #include "g_game.h"
 #include "keys.h"
 #include "hu_stuff.h" // need HUFONT start & end
+#include "d_net.h"
 #include "console.h"
 
+#include "m_menu.h"
+
 #include "i_system.h"
+#include "i_video.h"
+#include "r_draw.h"
 #include "v_video.h"
 
 #define MAXMOUSESENSITIVITY 100 // sensitivity steps
@@ -31,11 +36,10 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "
 // mouse values are used once
 consvar_t cv_mousexsens = {"mousexsens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
-	{"turnsmoothing",  "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
@@ -77,7 +81,6 @@ consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
 	{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
 };
 
-IMPL_RUMBLE_TYPE(wallbonk);
 IMPL_RUMBLE_TYPE(spinout);
 IMPL_RUMBLE_TYPE(sneakerboost);
 IMPL_RUMBLE_TYPE(offroad);
@@ -86,6 +89,7 @@ IMPL_RUMBLE_TYPE(stairjank);
 IMPL_RUMBLE_TYPE(brakedrift);
 IMPL_RUMBLE_TYPE(driftcharge);
 
+
 static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
 consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
 	{"gamepadled",  "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
@@ -191,6 +195,7 @@ void G_MapEventsToControls(event_t *ev)
 			{
 				CONS_Debug(DBG_GAMELOGIC, "Bad downkey input %d\n",ev->data1);
 			}
+
 #endif
 			break;
 
@@ -946,15 +951,16 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
 
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 
-	if (cv_gamepadled[playernum].value == 0 ||
-	   (window_notinfocus && cv_gamepadledifunfocused.value == 0) ||
-		color >= MAXTRANSLATIONS)
+	if (cv_gamepadled[playernum].value == 0 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
+	 || color >= MAXTRANSLATIONS)
 	{
 		return;
 	}
 
 	if (!I_GamepadHasLED(playernum))
+	{
 		return;
+	}
 
 	// so we can override this
 	skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
@@ -984,21 +990,29 @@ void G_DeviceLEDTick(void)
 	UINT8 i, newcolor;
 
 	if (numcontrollers == 0)
+	{
 		return;
+	}
 
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
+		{
 			continue;
+		}
 
 		// does not have a configurable led! :c
 		if (!I_GamepadHasLED(i))
+		{
 			continue;
+		}
 
 		newcolor = G_GetSkinColorForGamepad(i);
 
 		if (curcolor[i] == newcolor) // dont update if same colour
+		{
 			continue;
+		}
 
 		G_SetPlayerGamepadIndicatorColor(i, newcolor);
 		curcolor[i] = newcolor;
@@ -1032,7 +1046,9 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
 	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
 
 	if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
+	{
 		return;
+	}
 
 	// doesent need to be super precise
 	// but ensure this is within range (0-65535)
@@ -1061,34 +1077,46 @@ void G_DeviceRumbleTick(void)
 	UINT8 i;
 
 	if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
+	{
 		return;
+	}
 
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (!cv_usejoystick[i].value || !cv_rumble[i].value)
+		{
 			continue;
+		}
 
 		// does not support rumble! :c
 		if (!I_GamepadHasRumble(i))
+		{
 			continue;
+		}
 
 		if (camera[i].freecam)
+		{
 			continue;
+		}
 
 		// SDL rumble strength goes from a range or 0-65535 respectively
 		// the higher, the stronger it is
 		UINT16 low = 0, high = 0;
 		// for how long the action should rumble, in ms
-		UINT16 length = 57; // 57ms is a short pulse, matches super well with this updating once per tic
+		UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic
 
 		const player_t *player = P_GetLocalPlayerForNum(i);
 
 		if (!player)
+		{
 			continue;
+		}
 
 		// allow lua to do some crap for spectators
 		if (player->spectator || !player->mo)
+		{
 			continue;
+		}
 
 		// reset the rumble if you exit or are ded lel
 		if (player->exiting ||
@@ -1099,28 +1127,21 @@ void G_DeviceRumbleTick(void)
 			continue;
 		}
 
-		if (cv_rumble_wallbonk[i].value &&
-			(player->mo->eflags & MFE_JUSTBOUNCEDWALL))
-		{
-			high = RUMBLE_STRONG;
-			low = RUMBLE_MODERATE;
-		}
-		else if (cv_rumble_spinout[i].value &&
-				 player->kartstuff[k_spinouttimer])
+		if (cv_rumble_spinout[i].value
+			&& player->kartstuff[k_spinouttimer])
 		{
 			//low = high = FRACUNIT / 6;
-			// try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
-			low = high = FixedMul(RUMBLE_VERYSTRONG, FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)));
+			low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
 		}
-		else if (cv_rumble_sneakerboost[i].value &&
-				(player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
+		else if (cv_rumble_sneakerboost[i].value
+			&& (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
 		{
 			low = high = RUMBLE_STRONG;
 		}
-		else if (cv_rumble_offroad[i].value &&
-				(player->kartstuff[k_offroad]) &&
-				(player->speed != 0) &&
-				 P_IsObjectOnGround(player->mo))
+		else if (cv_rumble_offroad[i].value
+			&& (player->kartstuff[k_offroad])
+			&& (player->speed != 0)
+			&& P_IsObjectOnGround(player->mo))
 		{
 			// weaken this depending on if you got hyu or invinc
 			if (player->kartstuff[k_hyudorotimer])
@@ -1136,48 +1157,50 @@ void G_DeviceRumbleTick(void)
 				low = high = RUMBLE_MODERATE;
 			}
 		}
-		else if (cv_rumble_bananadrag[i].value &&
-				(player->kartstuff[k_bananadrag] > TICRATE) &&
-				(player->speed != 0) &&
-				 P_IsObjectOnGround(player->mo))
+		else if (cv_rumble_bananadrag[i].value
+			&& (player->kartstuff[k_bananadrag] > TICRATE)
+			&& (player->speed != 0)
+			&& P_IsObjectOnGround(player->mo))
 		{
 			if (leveltime & 1) // this is actually funny lel
 				high = RUMBLE_MODERATE;
 		}
-		else if (cv_rumble_stairjank[i].value &&
-				(player->stairjank > 8) &&
-				(player->speed != 0) &&
-				 P_IsObjectOnGround(player->mo))
+		else if (cv_rumble_stairjank[i].value
+			&& (player->stairjank > 8)
+			&& (player->speed != 0)
+			&& P_IsObjectOnGround(player->mo))
 		{
 			low = high = RUMBLE_VERYWEAK;
 		}
 
-		if (cv_rumble_brakedrift[i].value &&
-			player->kartstuff[k_brakedrift])
+		if (cv_rumble_brakedrift[i].value
+			&& player->kartstuff[k_brakedrift])
 		{
 			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
 		}
 
 		// pulse when gettin new driftlevel
 		// let this come last
-		if (cv_rumble_driftcharge[i].value &&
-			player->kartstuff[k_driftcharge] &&
-			player->driftlevel)
+		if (cv_rumble_driftcharge[i].value
+			&& player->kartstuff[k_driftcharge]
+			&& player->driftlevel)
 		{
 			high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
 
 			// make it rumble slightly longer the higher your driftlevel!
 			if (player->driftlevel == 2)
-				length = 114;
+				lenght = 114;
 			else if (player->driftlevel == 3)
-				length = 174;
+				lenght = 174;
 		}
 
 		// hack alert! i just dont want this thing constantly resetting the rumble lol
 		if (low == 0 && high == 0)
+		{
 			continue;
+		}
 
-		G_PlayerDeviceRumble(i, low, high, length);
+		G_PlayerDeviceRumble(i, low, high, lenght);
 	}
 }
 

src/g_input.h

@@ -118,8 +118,6 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 
 extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
-// rumble types
-extern consvar_t cv_rumble_wallbonk[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];

src/hardware/hw_bsp.c

@@ -54,6 +54,10 @@ typedef struct {
 // if no portals are found, the portal scanning phase can be skipped while rendering, saving a bit of time.
 boolean gl_maphasportals = false;
 
+// Determine on mapload if current map has any Horizonlines present
+// avoids doing a bunch of work during rendering
+boolean gl_maphashorizonlines = false;
+
 // ==========================================================================
 //                                    FLOOR & CEILING CONVEX POLYS GENERATION
 // ==========================================================================
@@ -401,7 +405,7 @@ static void SplitPoly (fdivline_t *dlnp,        // splitting parametric line
 }
 
 // checks if any line is a portal or horizonline, for optimization
-static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_t *line, subsector_t *sub)
+static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_t *line)
 {
 	// portal check
 	if (!gl_maphasportals && firstside && line->special == PORTALSPECIAL)
@@ -417,8 +421,8 @@ static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_
 	}
 
 	// horizonline check
-	if (line->special == HORIZONSPECIAL)
-		sub->hashorizon = true;
+	if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
+		gl_maphashorizonlines = true;
 }
 
 // Use each seg of the poly as a partition line, keep only the
@@ -431,7 +435,7 @@ static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_
 //  segcount : number of seg in the array
 // Return frontpoly, which may be new or ptr to poly.
 // Called from: HWR_SubsecPoly
-static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subsector_t *sub)
+static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
 {
 	INT32 i, j;
 	poly_t* frontpoly = poly;  // default, return same poly
@@ -443,6 +447,10 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subse
 	vertex_t *v1, *v2;
 	fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
 
+	// empty poly? just save us some time then
+	if (poly->numpts <= 0)
+		return frontpoly;
+
 	// for each seg of the subsector
 	for (; segcount--; lseg++)
 	{
@@ -452,7 +460,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly, subse
 		if (!line)
 			continue;
 
-		CheckForPortalsAndHorizonLines(lseg->side == 0, line, sub);
+		CheckForPortalsAndHorizonLines(lseg->side == 0, line);
 
 		if (line->sidenum[1] != NO_INDEX)
 		{
@@ -615,7 +623,7 @@ static inline void HWR_SubsecPoly(INT32 ssindex, poly_t *poly)
 
 	if (poly)
 	{
-		poly = CutOutSubsecPoly(lseg, segcount, poly, sub);
+		poly = CutOutSubsecPoly(lseg, segcount, poly);
 #ifdef DEBUG_HWBSP
 		totalsubsecpolys++;
 #endif
@@ -744,7 +752,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 #endif
 
 	// Recursively divide front space.
-	if (frontpoly)
+	if (LIKELY(frontpoly))
 	{
 		WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
 
@@ -871,9 +879,7 @@ static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)
 #endif
 }
 
-#ifdef DEBUG_HWBSP
 static INT32 numsplitpoly;
-#endif
 
 static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 {
@@ -912,9 +918,8 @@ static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
 
 					for (n = k+1; n < newpoly->numpts; n++)
 						newpoly->pts[n] = q->pts[n-1];
-#ifdef DEBUG_HWBSP
+
 					numsplitpoly++;
-#endif
 					extrasubsectors[bspnum].planepoly = newpoly;
 					HWR_FreePoly(q);
 					return;
@@ -960,9 +965,7 @@ static void SolveTProblem(void)
 	I_FinishUpdate(); // page flip or blit buffer
 #endif
 
-#ifdef DEBUG_HWBSP
 	numsplitpoly = 0;
-#endif
 
 	for (ssnum = 0; ssnum < num_extra_subsector; ssnum++)
 	{
@@ -999,8 +1002,8 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 	I_FinishUpdate(); // page flip or blit buffer
 #endif
 
-	// reset the portal flag
-	gl_maphasportals = false;
+	// reset the portal and horizonline flag
+	gl_maphasportals = gl_maphashorizonlines = false;
 
 	// find min/max boundaries of map
 #ifdef DEBUG_HWBSP

src/hardware/hw_defs.h

@@ -196,12 +196,6 @@ enum
 	SHADER_PALETTE_POSTPROCESS,
 	SHADER_UI_COLORMAP_FADE,
 
-	SHADER_POSTPROCESS_WATER,
-	SHADER_POSTPROCESS_HEAT,
-
-	SHADER_VHS_FUZZ,
-	SHADER_VHS_BAR,
-
 	NUMSHADERTARGETS
 };
 

src/hardware/hw_gl.h

@@ -66,11 +66,10 @@ void GL_FlushScreenTextures(void);
 
 void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
 void GL_DoScreenWipe(int wipeStart, int wipeEnd);
-void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize, boolean rewind);
+void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
 void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height);
 
 void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
-void GL_DoPostProcessor(INT32 type);
 
 boolean GL_InitShaders(void);
 void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage);

src/hardware/hw_main.cpp

@@ -16,7 +16,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "../d_main.h"
 #include "../doomstat.h"
 #include "../doomdef.h"
 
@@ -121,7 +120,7 @@ ps_metric_t ps_hw_batchdrawtime = {};
 static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags);
 static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
 
-static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap, subsector_t *subsector);
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
 static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
 static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
 
@@ -205,8 +204,7 @@ static CV_PossibleValue_t glpalettedepth_cons_t[] = {{16, "16 bits"}, {24, "24 b
 consvar_t cv_glscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, glscreentextures_cons_t, CV_screentextures_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 #ifdef USE_FBO_OGL
-static CV_PossibleValue_t glframebuffer_cons_t[] = {{0, "Off"}, {1, "Downsample"}, {2, "Always"}, {0, NULL}};
-consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL, glframebuffer_cons_t, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
 consvar_t cv_glmdls = {"gr_mdls", "Off", CV_SAVE|CV_CALL, CV_OnOff, M_UpdateOGLMenu, 0, NULL, NULL, 0, 0, NULL};
@@ -269,8 +267,8 @@ static void CV_glframebuffer_OnChange(void)
 	// screen FBO needs screen textures currently
 	if (cv_glframebuffer.value != 0 && ((cv_glscreentextures.value != 2) || !supportFBO))
 		CV_StealthSetValue(&cv_glframebuffer, 0); // dont recursively call this lul
-	if (loaded_config) // dont do this crap on startup, this is handled elsewhere
-		I_CheckDownSampleState(true);
+
+	I_CheckDownSampleState(true);
 	M_UpdateOGLMenu();
 	intermissionbginit = false;
 }
@@ -723,7 +721,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 
 	HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
 
-	if (subsector && subsector->hashorizon && cv_glhorizonlines.value)
+	if (gl_maphashorizonlines && subsector && !FOFsector && cv_glhorizonlines.value)
 	{
 		// Horizon lines
 		FOutVector horizonpts[6];
@@ -808,268 +806,6 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 #undef SETUP3DVERT
 }
 
-static void HWR_RenderFOFHorizonPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
-{
-	FSurfaceInfo Surf = {};
-	polyvertex_t *pv;
-	pslope_t *slope = NULL;
-	INT32 shader = SHADER_NONE;
-
-	size_t nrPlaneVerts;
-	INT32 i;
-
-	float height; // constant y for all points on the convex flat polygon
-	static float flatxref = 0.0f, flatyref = 0.0f;
-	static float fflatsize = 64.0f;
-	static INT32 flatflag = 63;
-	size_t len;
-
-	float tempxsow, tempytow;
-	float scrollx = 0.0f, scrolly = 0.0f;
-	float anglef  = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
-	angle_t angle = 0;
-
-	static FOutVector *planeVerts = NULL;
-	static UINT16 numAllocedPlaneVerts = 0;
-
-	poly_t *planepoly = xsub->planepoly;
-
-	if (!cv_glhorizonlines.value)
-		return;
-
-	if (!subsector || !subsector->hashorizon)
-		return;
-
-	// no convex poly were generated for this subsector
-	if (!planepoly)
-		return;
-
-	nrPlaneVerts = planepoly->numpts;
-
-	if (nrPlaneVerts < 3) // not even a triangle ?
-		return;
-
-	const sector_t *sec = FOFsector;
-
-	if (!(PolyFlags & PF_NoTexture))
-	{
-		HWR_GetFlat(lumpnum, R_NoEncore(FOFsector, !isceiling));
-	}
-
-	// Get the slope pointer to simplify future code
-	if (!isceiling && sec->f_slope)
-		slope = sec->f_slope;
-	else if (isceiling && sec->c_slope)
-		slope = sec->c_slope;
-
-	height = FixedToFloat(fixedheight);
-
-	// Allocate plane-vertex buffer if we need to
-	if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
-	{
-		numAllocedPlaneVerts = (UINT16)nrPlaneVerts;
-		Z_Free(planeVerts);
-		Z_Malloc(numAllocedPlaneVerts * sizeof (FOutVector), PU_LEVEL, &planeVerts);
-	}
-
-	len = W_LumpLength(lumpnum);
-
-	switch (len)
-	{
-		case 4194304: // 2048x2048 lump
-			fflatsize = 2048.0f;
-			flatflag = 2047;
-			break;
-		case 1048576: // 1024x1024 lump
-			fflatsize = 1024.0f;
-			flatflag = 1023;
-			break;
-		case 262144: // 512x512 lump
-			fflatsize = 512.0f;
-			flatflag = 511;
-			break;
-		case 65536: // 256x256 lump
-			fflatsize = 256.0f;
-			flatflag = 255;
-			break;
-		case 16384: // 128x128 lump
-			fflatsize = 128.0f;
-			flatflag = 127;
-			break;
-		case 1024: // 32x32 lump
-			fflatsize = 32.0f;
-			flatflag = 31;
-			break;
-		default: // 64x64 lump
-			fflatsize = 64.0f;
-			flatflag = 63;
-			break;
-	}
-
-	pv = planepoly->pts;
-
-	// reference point for flat texture coord for each vertex around the polygon
-	flatxref = static_cast<float>(static_cast<fixed_t>(pv->x) & (~flatflag)) / fflatsize;
-	flatyref = static_cast<float>(static_cast<fixed_t>(pv->y) & (~flatflag)) / fflatsize;
-
-	if (!isceiling) // it's a floor
-	{
-		scrollx = FixedToFloat(sec->floor_xoffs)/fflatsize;
-		scrolly = FixedToFloat(sec->floor_yoffs)/fflatsize;
-		angle = sec->floorpic_angle;
-	}
-	else // it's a ceiling
-	{
-		scrollx = FixedToFloat(sec->ceiling_xoffs)/fflatsize;
-		scrolly = FixedToFloat(sec->ceiling_yoffs)/fflatsize;
-		angle = sec->ceilingpic_angle;
-	}
-
-	if (angle) // Only needs to be done if there's an altered angle
-	{
-		// This needs to be done so that it scrolls in a different direction after rotation like software
-		tempxsow = flatxref;
-		tempytow = flatyref;
-		anglef   = ANG2RAD(InvAngle(angle));
-
-		// This needs to be done so everything aligns after rotation
-		// It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does
-		cosangf = cosf(anglef);
-		sinangf = sinf(anglef);
-		flatxref = (tempxsow * cosangf) - (tempytow * sinangf);
-		flatyref = (tempxsow * sinangf) + (tempytow * cosangf);
-	}
-
-#define SETUP3DVERT(vert, vx, vy) {\
-		/* Hurdler: add scrolling texture on floor/ceiling */\
-		vert->s = (float)(((vx) / fflatsize) - flatxref + scrollx);\
-		vert->t = (float)(flatyref - ((vy) / fflatsize) + scrolly);\
-\
-		/* Need to rotate before translate */\
-		if (angle) /* Only needs to be done if there's an altered angle */\
-		{\
-			tempxsow = vert->s;\
-			tempytow = vert->t;\
-			vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
-			vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
-		}\
-\
-		if (slope)\
-		{\
-			fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
-			height = FixedToFloat(fixedheight);\
-		}\
-\
-		vert->x = (vx);\
-		vert->y = height;\
-		vert->z = (vy);\
-\
-}
-
-	HWR_Lighting(&Surf, lightlevel, planecolormap, false);
-
-	if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
-	{
-		Surf.PolyColor.s.alpha = (UINT8)alpha;
-		PolyFlags |= PF_Modulated;
-	}
-	else
-		PolyFlags |= PF_Masked|PF_Modulated;
-
-	if (HWR_UseShader())
-	{
-		if (PolyFlags & PF_Fog)
-			shader = SHADER_FOG;
-		else if (cv_ripplewater.value && (PolyFlags & PF_Ripple))
-			shader = SHADER_WATER;
-		else
-			shader = SHADER_FLOOR;
-
-		PolyFlags |= PF_ColorMapped;
-	}
-
-	// Horizon lines
-	FOutVector horizonpts[6];
-	float dist, vx, vy;
-	float x1, y1, xd, yd;
-	UINT8 numplanes, j;
-	vertex_t v; // For determining the closest distance from the line to the camera, to split render planes for minimum distortion;
-
-	static constexpr float renderdist    = 27000.0f; // How far out to properly render the plane
-	static constexpr float farrenderdist = 32768.0f; // From here, raise plane to horizon level to fill in the line with some texture distortion
-
-	const seg_t *line = &segs[subsector->firstline];
-
-	for (i = 0; i < subsector->numlines; i++, line++)
-	{
-		if (line->polyseg)
-			continue;
-
-		line_t* ld = line->linedef;
-
-		if (LIKELY(ld->special != HORIZONSPECIAL))
-			continue;
-
-		if (R_PointOnSegSide(viewx, viewy, line) != 0)
-			continue;
-
-		P_ClosestPointOnLine(viewx, viewy, ld, &v);
-		dist = FixedToFloat(R_PointToDist(v.x, v.y));
-
-		x1 = (line->fv1.x);
-		y1 = (line->fv1.y);
-
-		xd = (line->fv2.x) - x1;
-		yd = (line->fv2.y) - y1;
-
-		// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
-		dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
-
-		if (dist > 100.0f)
-			numplanes = 100;
-		else
-			numplanes = (UINT8)dist + 1;
-
-		for (j = 0; j < numplanes; j++)
-		{
-			// Left side
-			vx = x1 + xd * j / numplanes;
-			vy = y1 + yd * j / numplanes;
-			SETUP3DVERT((&horizonpts[1]), vx, vy);
-
-			dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
-			vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
-			vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
-			SETUP3DVERT((&horizonpts[0]), vx, vy);
-
-			// Right side
-			vx = x1 + xd * (j+1) / numplanes;
-			vy = y1 + yd * (j+1) / numplanes;
-			SETUP3DVERT((&horizonpts[2]), vx, vy);
-
-			dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
-			vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
-			vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
-			SETUP3DVERT((&horizonpts[3]), vx, vy);
-
-			// Horizon fills
-			vx = (horizonpts[0].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
-			vy = (horizonpts[0].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
-			SETUP3DVERT((&horizonpts[5]), vx, vy);
-			horizonpts[5].y = gl_viewz;
-
-			vx = (horizonpts[3].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
-			vy = (horizonpts[3].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
-			SETUP3DVERT((&horizonpts[4]), vx, vy);
-			horizonpts[4].y = gl_viewz;
-
-			// Draw
-			HWR_ProcessPolygon(&Surf, horizonpts, 6, PolyFlags, shader, true);
-		}
-	}
-#undef SETUP3DVERT
-}
-
 #ifdef WALLSPLATS
 static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
 {
@@ -3224,14 +2960,16 @@ static void HWR_Subsector(size_t num)
 						UINT8 alpha;
 
 						light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
+
 						alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
+
 						HWR_AddTransparentFloor(0,
 												&extrasubsectors[num],
 												!bottom,
 												roverheight,
 												*gl_frontsector->lightlist[light].lightlevel,
 												alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
-												true, rover->master->frontsector->extra_colormap, sub);
+												true, rover->master->frontsector->extra_colormap);
 					}
 					else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
 					{
@@ -3243,12 +2981,13 @@ static void HWR_Subsector(size_t num)
 												roverheight,
 												*gl_frontsector->lightlist[light].lightlevel,
 												CLAMP(rover->alpha, 0, 255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
-												false, gl_frontsector->lightlist[light].extra_colormap, sub);
+												false, gl_frontsector->lightlist[light].extra_colormap);
 					}
 					else
 					{
 						HWR_GetFlat(flatlump, R_NoEncore(rover->master->frontsector, bottom));
 						light = R_GetPlaneLight(gl_frontsector, centerHeight, underside);
+
 						HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump,
 										rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
 					}
@@ -4452,7 +4191,7 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
 	wallinfo->wallcolormap = wallcolormap;
 }
 
-static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap, subsector_t *subsector)
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
 {
 	planeinfo_t *planeinfo = static_cast<planeinfo_t*>(HWR_CreateDrawNode(DRAWNODE_PLANE));
 
@@ -4466,9 +4205,6 @@ static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, b
 	planeinfo->blend = blend;
 	planeinfo->fogplane = fogplane;
 	planeinfo->planecolormap = planecolormap;
-
-	// horizonplanes need to be drawn BEFORE skywalls, so lets hope this works without too many issues....
-	HWR_RenderFOFHorizonPlane(subsector, planeinfo->xsub, planeinfo->isceiling, planeinfo->fixedheight, planeinfo->blend, planeinfo->lightlevel, planeinfo->lumpnum, planeinfo->FOFSector, (UINT8)planeinfo->alpha, planeinfo->planecolormap);
 }
 
 // Adding this for now until I can create extrasubsector info for polyobjects
@@ -5992,7 +5728,8 @@ void HWR_RenderPlayerView(void)
 
 	if (HWR_UseShader())
 	{
-		GL_SetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime.
+		if (cv_ripplewater.value)
+			GL_SetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime.
 
 		if (cv_glmdls.value)
 		{
@@ -6001,7 +5738,7 @@ void HWR_RenderPlayerView(void)
 				const angle_t light_angle = maplighting.angle - viewangle + ANGLE_90; // I fucking hate OGL's coordinate system
 				GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_X, FINECOSINE(light_angle >> ANGLETOFINESHIFT));
 				GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_Y, 0);
-				GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_Z, -FINESINE(light_angle >> ANGLETOFINESHIFT));
+				GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_Z,  -FINESINE(light_angle >> ANGLETOFINESHIFT));
 			}
 
 			GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_CONTRAST, maplighting.contrast);
@@ -6351,59 +6088,43 @@ static void HWR_DoPostProcessor(void)
 		GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
 
 	// Drunken vision! WooOOooo~
+	// 10 by 10 grid. 2 coordinates (xy)
+	float v[SCREENVERTS][SCREENVERTS][2];
+	float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
 
-	// shader based, should be a bit faster!
-	if (HWR_UseShader())
+	UINT8 x, y;
+	float WAVELENGTH;
+	float AMPLITUDE;
+	float FREQUENCY;
+
+	// Modifies the wave.
+	if (thiscam->postimg & POSTIMG_WATER)
 	{
-		if (thiscam->postimg & POSTIMG_WATER)
-		{
-			GL_DoPostProcessor(POSTIMG_WATER);
-		}
-		else if (thiscam->postimg & POSTIMG_HEAT)
-		{
-			GL_DoPostProcessor(POSTIMG_HEAT);
-		}
+		WAVELENGTH = 5.0f;
+		AMPLITUDE = 40.0f;
+		FREQUENCY = 8.0f;
 	}
 	else
 	{
-		// 10 by 10 grid. 2 coordinates (xy)
-		float v[SCREENVERTS][SCREENVERTS][2];
-		float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
-
-		UINT8 x, y;
-		float WAVELENGTH;
-		float AMPLITUDE;
-		float FREQUENCY;
-
-		// Modifies the wave.
-		if (thiscam->postimg & POSTIMG_WATER)
-		{
-			WAVELENGTH = 5.0f;
-			AMPLITUDE = 40.0f;
-			FREQUENCY = 8.0f;
-		}
-		else
-		{
-			WAVELENGTH = 10.0f;
-			AMPLITUDE = 60.0f;
-			FREQUENCY = 4.0f;
-		}
-
-		//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
-
-		for (x = 0; x < SCREENVERTS; x++)
-		{
-			for (y = 0; y < SCREENVERTS; y++)
-			{
-				// Change X position based on its Y position.
-				v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
-				v[x][y][1] = y-4.5f; // (y / scale)
-			}
-		}
-
-		GL_PostImgRedraw(v);
+		WAVELENGTH = 10.0f;
+		AMPLITUDE = 60.0f;
+		FREQUENCY = 4.0f;
 	}
 
+	//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
+
+	for (x = 0; x < SCREENVERTS; x++)
+	{
+		for (y = 0; y < SCREENVERTS; y++)
+		{
+			// Change X position based on its Y position.
+			v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
+			v[x][y][1] = y-4.5f; // (y / scale)
+		}
+	}
+
+	GL_PostImgRedraw(v);
+
 	// Capture the screen again for screen waving on the intermission
 	if (gamestate != GS_INTERMISSION)
 		GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);

src/hardware/hw_main.h

@@ -145,9 +145,9 @@ FUNCINLINE static ATTRINLINE void HWR_DrawIntermissionBG(void)
 	GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC1, NULL, 0);
 }
 
-FUNCINLINE static ATTRINLINE void HWR_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize, boolean rewind)
+FUNCINLINE static ATTRINLINE void HWR_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize)
 {
-	GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize, rewind);
+	GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
 }
 
 FUNCINLINE static ATTRINLINE void HWR_MakeScreenTexture(void)
@@ -171,6 +171,7 @@ void HWR_ProcessSeg(void); // Sort of like GLWall::Process in GZDoom
 // hw_bsp.c
 void HWR_CreatePlanePolygons(INT32 bspnum);
 extern boolean gl_maphasportals;
+extern boolean gl_maphashorizonlines;
 
 // Console variables
 extern CV_PossibleValue_t glanisotropicmode_cons_t[];

src/hardware/hw_shaders.c

@@ -53,18 +53,6 @@ static struct {
 	// UI colormap fade shader
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_UI_COLORMAP_FADE_FRAGMENT_SHADER},
 
-	// water postprocess shader
-	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_POSTPROCESS_FRAGMENT_WATER},
-
-	// heat postprocess shader
-	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_POSTPROCESS_FRAGMENT_HEAT},
-
-	// vhs fuzz
-	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_VHS_FUZZ_SHADER},
-
-	// vhs bars
-	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_VHS_BAR_SHADER},
-
 	{NULL, NULL},
 };
 
@@ -456,10 +444,6 @@ customshaderxlat_t shaderxlat[] =
 	{"Sky", SHADER_SKY},
 	{"PalettePostprocess", SHADER_PALETTE_POSTPROCESS},
 	{"UIColormapFade", SHADER_UI_COLORMAP_FADE},
-	{"PostProcessWater", SHADER_POSTPROCESS_WATER},
-	{"PostProcessHeat", SHADER_POSTPROCESS_HEAT},
-	{"VHSFuzz", SHADER_VHS_FUZZ},
-	{"VHSBar", SHADER_VHS_BAR},
 	{NULL, 0},
 };
 

src/hardware/hw_shaders.h

@@ -337,125 +337,6 @@
 		"gl_FragColor = texture2D(lighttable_tex, lighttable_coord);\n" \
 	"}\0" \
 
-// these are RRs postprocess shaders
-// for water and heat
-/*
-#define GLSL_POSTPROCESS_FRAGMENT_WATER \
-	"uniform sampler2D tex;\n" \
-	"uniform float leveltime;\n" \
-	"void main(void) {\n" \
-		"vec2 uv = gl_TexCoord[0].st;\n" \
-		"float y = 1.0 - uv.y;\n" \
-		"uv.x += sin(leveltime * 2.0 + y * 20.0) * 0.01;\n" \
-		"uv = clamp(uv, vec2(0.0), vec2(0.9999));\n" \
-		"gl_FragColor = texture2D(tex, uv);\n" \
-	"}\0"
-
-#define GLSL_POSTPROCESS_FRAGMENT_HEAT \
-	"uniform sampler2D tex;\n" \
-	"uniform float leveltime;\n" \
-	"void main(void) {\n" \
-		"vec2 uv = gl_TexCoord[0].st;\n" \
-		"float y = 1.0 - uv.y;\n" \
-		"float time = leveltime * 35.0;\n" \
-		"uv.x += max(sin((time / 35.0) * 1.2 - y * 5.0) - 0.995, 0.0);\n" \
-		"uv.x -= max(sin(((time + 24.0) / 35.0) * 0.2 - y * 1.5) - 0.990, 0.0);\n" \
-		"uv = clamp(uv, vec2(0.0), vec2(0.9999));\n" \
-		"gl_FragColor = texture2D(tex, uv);\n" \
-	"}\0"
-*/
-
-// for reference
-// sin(leveltime * X + (y) + Y) * Z
-// X = Speed, Y = Vertical phase, Z = Amplitude
-
-// this matches software at 720p wonderfully
-#define GLSL_POSTPROCESS_FRAGMENT_WATER \
-	"#version 120\n" \
-	"uniform sampler2D tex;\n" \
-	"uniform vec2 scr_resolution;\n" \
-	"uniform vec2 scr_tex_size;\n" \
-	"uniform float leveltime;\n" \
-	"void main(void) {\n" \
-		"vec2 uv = gl_TexCoord[0].st;\n" \
-		"vec2 maxuv = scr_resolution / scr_tex_size;\n" \
-		"float y = 1.0 - uv.y;\n" \
-		"uv.x += sin(leveltime * 3.0 + y * 15.0) * 0.0025;\n" \
-		"uv = clamp(uv, vec2(0.0), maxuv - vec2(0.0001));\n" \
-		"gl_FragColor = texture2D(tex, uv);\n" \
-	"}\0"
-
-// like the fixed function version, this is just the water wave again
-// a bit readjusted since the shader wave is more lean
-// makes it less neausiating anyways :p
-#define GLSL_POSTPROCESS_FRAGMENT_HEAT \
-	"#version 120\n" \
-	"uniform sampler2D tex;\n" \
-	"uniform vec2 scr_resolution;\n" \
-	"uniform vec2 scr_tex_size;\n" \
-	"uniform float leveltime;\n" \
-	"void main(void) {\n" \
-		"vec2 uv = gl_TexCoord[0].st;\n" \
-		"vec2 maxuv = scr_resolution / scr_tex_size;\n" \
-		"float y = 1.0 - uv.y;\n" \
-		"uv.x += sin(leveltime * 6.0 + y * 22.5) * 0.00125;\n" \
-		"uv = clamp(uv, vec2(0.0), maxuv - vec2(0.0001));\n" \
-		"gl_FragColor = texture2D(tex, uv);\n" \
-	"}\0"
-
-// screen fuzzyness
-// basically just what we did before as a shader lul
-// thanks https://stackoverflow.com/a/4275343 for the pseudo random stuff for glsl
-#define GLSL_VHS_FUZZ_SHADER \
-	"#version 120\n" \
-	"uniform sampler2D tex;\n" \
-	"uniform vec2 scr_resolution;\n" \
-	"uniform vec2 scr_tex_size;\n" \
-	"uniform float vhs_time;\n" \
-	"uniform float scr_dup;\n" \
-	"void main(void) {\n" \
-		"vec2 uv = gl_TexCoord[0].st;\n" \
-		"vec2 maxuv = scr_resolution / scr_tex_size;\n" \
-		"float y = 1.0 - uv.y;\n" \
-		"float ystep = (2.0 / scr_resolution.y) * scr_dup / 4.0;\n" \
-		"float rand = fract(sin((floor(y / ystep) + vhs_time) * 12.9898 + 78.233) * 43758.5453);\n" \
-		"uv.x += floor(rand * 128.0) / -22000.0;\n" \
-		"uv = clamp(uv, vec2(0.0), maxuv - vec2(0.0001));\n" \
-		"gl_FragColor = texture2D(tex, uv);\n" \
-	"}\0"
-
-// repurposed the RR heat shader
-// since it kinda matched the vhs bars lul
-#define GLSL_VHS_BAR_SHADER \
-	"#version 120\n" \
-	"uniform sampler2D tex;\n" \
-	"uniform vec2 scr_resolution;\n" \
-	"uniform vec2 scr_tex_size;\n" \
-	"uniform float vhs_time;\n" \
-	"uniform float vhs_rewind;\n" \
-	"void main(void) {\n" \
-		"vec2 uv = gl_TexCoord[0].st;\n" \
-		"vec2 maxuv = scr_resolution / scr_tex_size;\n" \
-		"float y = 1.0 - uv.y;\n" \
-		"float downspd = (vhs_rewind > 0.5) ? 2.0 : 1.0;\n" \
-		"float downbar = max(sin(vhs_time * downspd - y * 5.0) - 0.95, 0.0);\n" \
-		"float upspd = (vhs_rewind > 0.5) ? 3.0 : 1.8;\n" \
-		"float upbar = max(sin((vhs_time * -1.0) * upspd - y * 5.0) - 0.95, 0.0);\n" \
-		"uv.x += (downbar) * 0.25;\n" \
-		"float updistort = (vhs_rewind > 0.5) ? 0.4125: 0.25;\n" \
-		"uv.x -= (upbar) * updistort;\n" \
-		"uv = clamp(uv, vec2(0.0), maxuv - vec2(0.0001));\n" \
-		"vec4 color = texture2D(tex, uv);\n" \
-		"float downcol = step(0.00001, downbar);\n" \
-		"float upcol = step(0.00001, upbar);\n" \
-		"color.rgb = mix(color.rgb, color.rgb * (190.0 / 255.0), downcol);\n" \
-		"color.rgb = mix(color.rgb, color.rgb * (190.0 / 255.0), upcol);\n" \
-		"color.a = mix(color.a, color.a * (250.0 / 255.0), downcol);\n" \
-		"color.a = mix(color.a, color.a * (250.0 / 255.0), upcol);\n" \
-		"gl_FragColor = color;\n" \
-	"}\0"
-
-
 // ================
 //  Fallback shaders
 // ================

src/hardware/r_opengl/r_opengl.c

@@ -141,56 +141,26 @@ enum
 
 typedef struct
 {
-	GLuint fboobj;           // normal single sample fbo
-	GLuint rboobj;           // normal single sample rbo for depth and stencil stuff
-	GLuint tex;              // fbo texture for color
-	GLuint msaa_fboobj;      // msaa fbo
-	GLuint msaa_rboobj;      // msaa rbo for color this time
-	GLuint msaa_depthrboobj; // msaa rbo for depth and stencil stuff
+	GLuint fboobj; // actual Framebuffer Object
+	GLuint rboobj; // Renderbuffer Object
+	GLuint tex;    // Framebuffer texture
 	boolean init;
-	boolean msaa;            // true if the msaa fbo is the render target ugh
-	boolean bound;           // true if the fbo is currently bound as the framebuffer
 } fboobj_t;
 
-// this is a little messy but less messy than having two of those tbh
 static fboobj_t framebufferobject = {};
 
 int supportFBO = FBO_NONE;
 
 // older gl versions might not have these, so prevent compile errors
-#ifndef GL_DEPTH_COMPONENT
-#define GL_DEPTH_COMPONENT 0x1902
-#endif
-#ifndef GL_DEPTH_ATTACHMENT_EXT
-#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
-#endif
+// this should still give a simple depth only rbo
 #ifndef GL_DEPTH24_STENCIL8
-#define GL_DEPTH24_STENCIL8 0x88F0
+GL_DEPTH24_STENCIL8 GL_DEPTH_COMPONENT_EXT
 #endif
 #ifndef GL_DEPTH_STENCIL_ATTACHMENT
-#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
-#endif
-#ifndef GL_COLOR_ATTACHMENT0_EXT
-#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
-#endif
-#ifndef GL_READ_FRAMEBUFFER_EXT
-#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
-#endif
-#ifndef GL_DRAW_FRAMEBUFFER_EXT
-#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
-#endif
-#ifndef GL_FRAMEBUFFER_EXT
-#define GL_FRAMEBUFFER_EXT 0x8D40
-#endif
-#ifndef GL_RENDERBUFFER_EXT
-#define GL_RENDERBUFFER_EXT 0x8D41
-#endif
-#ifndef GL_FRAMEBUFFER_COMPLETE_EXT
-#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
+GL_DEPTH_STENCIL_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
 #endif
 
 static void GL_FBO_DeleteAttachments(void);
-static void GL_FBO_Resolve(GLbitfield mask);
 #endif
 
 // needed for glportals
@@ -508,10 +478,6 @@ typedef void (APIENTRY * PFNglRenderbufferStorage) (GLenum target, GLenum intern
 static PFNglRenderbufferStorage pglRenderbufferStorage;
 typedef void (APIENTRY * PFNglFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer);
 static PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
-typedef void (APIENTRY * PFNglRenderbufferStorageMultisample) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-static PFNglRenderbufferStorageMultisample pglRenderbufferStorageMultisample;
-typedef void (APIENTRY * PFNglBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-static PFNglBlitFramebuffer pglBlitFramebuffer;
 
 /* 2.1 extension functions for framebuffers and renderbuffers */
 typedef void (APIENTRY * PFNglGenFramebuffersEXT) (GLsizei n, GLuint *ids);
@@ -761,14 +727,6 @@ typedef enum
 
 	gluniform_scr_resolution,
 
-	// postprocess stuff
-	gluniform_scr_dup,
-	gluniform_scr_tex_size,
-
-	// vhs
-	gluniform_vhs_rewind,
-	gluniform_vhs_time,
-
 	gluniform_max,
 } gluniform_t;
 
@@ -801,9 +759,6 @@ static float shader_light_z = 0.0f;
 static INT32 shader_light_contrast = 0;
 static INT32 shader_light_backlight = 0;
 
-static float shader_vhs_rewind = 1.0f;
-static float shader_vhs_time = 0.0f;
-
 // Lactozilla: Shader functions
 static boolean GL_Shader_CompileProgram(gl_shader_t *shader, GLint i);
 static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade);
@@ -944,17 +899,6 @@ void SetupGLFunc4(void)
 			GetGLfunc(glRenderbufferStorage);
 			GetGLfunc(glFramebufferRenderbuffer);
 
-			// multisample support, this should be in core per gl 3.0 and newer
-			pglRenderbufferStorageMultisample = GetGLFunc("glRenderbufferStorageMultisample");
-			pglBlitFramebuffer = GetGLFunc("glBlitFramebuffer");
-
-			if (!pglRenderbufferStorageMultisample || !pglBlitFramebuffer)
-			{
-				pglRenderbufferStorageMultisample = NULL;
-				pglBlitFramebuffer = NULL;
-				GL_DBG_Printf("\nFBO: No multisample support\n");
-			}
-
 			GL_DBG_Printf("\nFBO: ARB extensions found\n");
 		}
 		else if (fbocheck == FBO_EXT) // uh oh only support old fbo extensions...
@@ -991,21 +935,6 @@ void SetupGLFunc4(void)
 			GetGLfunc(glFramebufferRenderbufferEXT);
 			pglFramebufferRenderbuffer = pglFramebufferRenderbufferEXT;
 
-			// multisample support needs the EXT multisample and blit extensions
-			if (GL_isExtAvailable("GL_EXT_framebuffer_multisample", gl_extensions) &&
-				GL_isExtAvailable("GL_EXT_framebuffer_blit", gl_extensions))
-			{
-				pglRenderbufferStorageMultisample = GetGLFunc("glRenderbufferStorageMultisampleEXT");
-				pglBlitFramebuffer = GetGLFunc("glBlitFramebufferEXT");
-			}
-
-			if (!pglRenderbufferStorageMultisample || !pglBlitFramebuffer)
-			{
-				pglRenderbufferStorageMultisample = NULL;
-				pglBlitFramebuffer = NULL;
-				GL_DBG_Printf("\nFBO: No multisample support\n");
-			}
-
 			GL_DBG_Printf("\nFBO: EXT extensions with packed depth-stencil\n");
 		}
 
@@ -1526,15 +1455,6 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 	const INT32 stride = (screen_width/scale)*3;
 	INT32 scanlines = screen_height;
 	GLubyte * restrict image;
-#ifdef USE_FBO_OGL
-	const boolean msaa_fbo = (framebufferobject.bound && framebufferobject.msaa);
-#endif
-
-#ifdef USE_FBO_OGL
-	// cant read from the msaa fbo, so gotta blit it first into either the single sample fbo or the screen framebuffer....
-	if (msaa_fbo)
-		GL_FBO_Resolve(GL_COLOR_BUFFER_BIT);
-#endif
 
 	// at the time this function is called, generic2 can be found drawn on the framebuffer
 	// if some other screen texture is needed, draw it to the framebuffer
@@ -1576,16 +1496,9 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
 			memcpy(dest + i, image + i*scale, 3);
 		dest += stride;
 	}
-	// this probably could be done with fbos, might mess around with that some time :3
 
 	// ...yet still, restrict doesn't make the inner loop any faster
 	free(image - ((screen_height % scale) * screen_width*3));
-
-#ifdef USE_FBO_OGL
-	// this´ll reenable the msaa fbo....
-	if (msaa_fbo)
-		GL_FBO_Enable();
-#endif
 }
 
 // -----------------+
@@ -2339,14 +2252,7 @@ static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRG
 
 		UNIFORM_1(shader->uniforms[gluniform_leveltime], shader_leveltime, pglUniform1f);
 
-		UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)screen_width, (GLfloat)screen_height, pglUniform2f);
-		// udup is before highres scale adjustments
-		UNIFORM_1(shader->uniforms[gluniform_scr_dup], (GLfloat)vid.udup, pglUniform1f);
-		// grrrrr stupid 2.0 support.. used similar to yfix, xfix
-		UNIFORM_2(shader->uniforms[gluniform_scr_tex_size], (GLfloat)screen_texsizew, (GLfloat)screen_texsizeh, pglUniform2f);
-
-		UNIFORM_1(shader->uniforms[gluniform_vhs_rewind], shader_vhs_rewind, pglUniform1f);
-		UNIFORM_1(shader->uniforms[gluniform_vhs_time], shader_vhs_time, pglUniform1f);
+		UNIFORM_2(shader->uniforms[gluniform_scr_resolution], (GLfloat)vid.width, (GLfloat)vid.height, pglUniform2f);
 
 		#undef UNIFORM_1
 		#undef UNIFORM_2
@@ -2479,15 +2385,6 @@ static boolean GL_Shader_CompileProgram(gl_shader_t *shader, GLint i)
 
 	// misc.
 	shader->uniforms[gluniform_leveltime]             = GETUNI("leveltime");
-
-	// postprocessor stuff (water/heat effect)
-	shader->uniforms[gluniform_scr_dup]               = GETUNI("scr_dup");
-	shader->uniforms[gluniform_scr_tex_size]          = GETUNI("scr_tex_size");
-
-	// vhs stuff
-	shader->uniforms[gluniform_vhs_rewind]            = GETUNI("vhs_rewind");
-	shader->uniforms[gluniform_vhs_time]              = GETUNI("vhs_time");
-
 #undef GETUNI
 
 	// set permanent uniform values
@@ -3345,7 +3242,7 @@ void GL_SetTransform(FTransform *stransform)
 #ifdef USE_FBO_OGL
 static void GL_FBO_DeleteAttachments(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	// Unbind the framebuffer
@@ -3358,44 +3255,13 @@ static void GL_FBO_DeleteAttachments(void)
 	if (framebufferobject.rboobj)
 		pglDeleteRenderbuffers(1, &framebufferobject.rboobj);
 
-	if (framebufferobject.msaa_rboobj)
-		pglDeleteRenderbuffers(1, &framebufferobject.msaa_rboobj);
-
-	if (framebufferobject.msaa_depthrboobj)
-		pglDeleteRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
-
 	framebufferobject.tex = 0;
 	framebufferobject.rboobj = 0;
-	framebufferobject.msaa_rboobj = 0;
-	framebufferobject.msaa_depthrboobj = 0;
 	framebufferobject.init = false;
-	framebufferobject.bound = false;
-}
-
-// blit the msaa fbo into the normal single sample fbo
-// so we can use it to copy from and stuff
-static void GL_FBO_Resolve(GLbitfield mask)
-{
-	if (supportFBO == FBO_NONE || !framebufferobject.init || !framebufferobject.msaa)
-		return;
-
-	if (!pglBlitFramebuffer)
-		return;
-
-	pglBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
-	pglBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, framebufferobject.fboobj);
-
-	pglBlitFramebuffer(0, 0, screen_width, screen_height,
-						0, 0, screen_width, screen_height,
-						mask, GL_NEAREST);
-
-	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
 }
 
 static void GL_FBO_Generate(void)
 {
-	GLint msaasamples;
-
 	if (supportFBO == FBO_NONE || framebufferobject.init)
 		return;
 
@@ -3455,76 +3321,12 @@ static void GL_FBO_Generate(void)
 		GL_MSG_Error("GL_FBO_Generate: Failed to create Framebuffer Object");
 
 		// if this fails, dont retry it a gazillion times
-		// this probably wouldnt recover and we dont want any more black screens...
+		// this wouldnt recover
 		supportFBO = FBO_NONE;
 		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 		return;
 	}
 
-	// Try to set up a multisampled render target for MSAA
-	framebufferobject.msaa = false;
-	msaasamples = (GLint)msaa;
-
-	// maybe should just make more "supportFBO" cases or smth but :chaosleep:
-	if (msaasamples > 1 && pglRenderbufferStorageMultisample && pglBlitFramebuffer)
-	{
-		if (!framebufferobject.msaa_fboobj)
-			pglGenFramebuffers(1, &framebufferobject.msaa_fboobj);
-
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
-
-		// Generate the multisampled color renderbuffer
-		if (!framebufferobject.msaa_rboobj)
-		{
-			pglGenRenderbuffers(1, &framebufferobject.msaa_rboobj);
-			pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
-			pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_RGBA8, screen_width, screen_height);
-			pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
-		}
-
-		// Generate the multisampled depth/stencil renderbuffer
-		if (!framebufferobject.msaa_depthrboobj)
-		{
-			pglGenRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
-			pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-
-			if (supportFBO == FBO_ARB)
-			{
-				pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_DEPTH24_STENCIL8, screen_width, screen_height);
-				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-			}
-			else if (supportFBO == FBO_EXT)
-			{
-				pglRenderbufferStorageMultisample(GL_RENDERBUFFER_EXT, msaasamples, GL_DEPTH_STENCIL_EXT, screen_width, screen_height);
-				// attach a renderbuffer to depth attachment point
-				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-				// attach a renderbuffer to stencil attachment point
-				pglFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, framebufferobject.msaa_depthrboobj);
-			}
-		}
-
-		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
-
-		if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) == GL_FRAMEBUFFER_COMPLETE_EXT)
-		{
-			framebufferobject.msaa = true;
-			GL_ClearBuffer(true, true, true, NULL);
-			GL_DBG_Printf("\nGL_FBO_Generate: Multisampled framebuffer created with %d samples\n", msaasamples);
-		}
-		else
-		{
-			GL_MSG_Warning("GL_FBO_Generate: Failed to create multisampled Framebuffer Object, falling back to no MSAA");
-
-			if (framebufferobject.msaa_rboobj)
-				pglDeleteRenderbuffers(1, &framebufferobject.msaa_rboobj);
-			if (framebufferobject.msaa_depthrboobj)
-				pglDeleteRenderbuffers(1, &framebufferobject.msaa_depthrboobj);
-
-			framebufferobject.msaa_rboobj = 0;
-			framebufferobject.msaa_depthrboobj = 0;
-		}
-	}
-
 	// Unbind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 
@@ -3533,13 +3335,11 @@ static void GL_FBO_Generate(void)
 
 void GL_FBO_BindMainFrameBuffer(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
 	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
-
-	framebufferobject.bound = false;
 }
 
 void GL_FBO_Enable(void)
@@ -3553,23 +3353,13 @@ void GL_FBO_Enable(void)
 	if (!framebufferobject.init)
 		return;
 
-	if (framebufferobject.msaa)
-	{
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.msaa_fboobj);
-		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.msaa_rboobj);
-	}
-	else
-	{
-		pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
-		pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
-	}
-
-	framebufferobject.bound = true;
+	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
+	pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
 }
 
 void GL_FBO_Disable(void)
 {
-	if (supportFBO == FBO_NONE)
+	if (supportFBO == FBO_NONE || !framebufferobject.init)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3580,14 +3370,7 @@ void GL_FBO_Disable(void)
 		pglDeleteFramebuffers(1, &framebufferobject.fboobj);
 	framebufferobject.fboobj = 0;
 
-	if (framebufferobject.msaa_fboobj)
-		pglDeleteFramebuffers(1, &framebufferobject.msaa_fboobj);
-	framebufferobject.msaa_fboobj = 0;
-
 	GL_FBO_DeleteAttachments();
-
-	framebufferobject.msaa = false;
-	framebufferobject.bound = false;
 }
 #endif
 
@@ -3624,55 +3407,6 @@ INT32 GL_GetTextureUsed(void)
 	return res;
 }
 
-void GL_DoPostProcessor(INT32 type)
-{
-	float fix[8];
-	float xfix, yfix;
-
-	if (gl_enable_screen_textures != 2)
-		return;
-
-	xfix = 1/((float)screen_texsizew/(float)screen_width);
-	yfix = 1/((float)screen_texsizeh/(float)screen_height);
-
-	fix[0] = fix[1] =
-	fix[2] = fix[7] = 0.0f;
-
-	fix[3] = fix[5] = yfix;
-	fix[4] = fix[6] = xfix;
-
-	// this shouldnt be necessary, since this comes after level draw
-	// but somehow it breaks without this??
-	pglMatrixMode(GL_PROJECTION);
-	pglPushMatrix();
-	pglLoadIdentity();
-	pglMatrixMode(GL_MODELVIEW);
-	pglPushMatrix();
-	pglLoadIdentity();
-
-	GL_SetBlend(PF_NoDepthTest);
-
-	pglActiveTexture(GL_TEXTURE0);
-	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_GENERIC1]);
-	tex_downloaded = screenTextures[HWD_SCREENTEXTURE_GENERIC1];
-
-	int shader = (type == POSTIMG_WATER) ? SHADER_POSTPROCESS_WATER : SHADER_POSTPROCESS_HEAT;
-	GL_SetShader(HWR_GetShaderFromTarget(shader));
-	GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
-	pglColor4ubv(white);
-
-	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-	pglVertexPointer(3, GL_FLOAT, 0, defaultscreenVerts);
-	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-	GL_UnSetShader();
-
-	pglMatrixMode(GL_PROJECTION);
-	pglPopMatrix();
-	pglMatrixMode(GL_MODELVIEW);
-	pglPopMatrix();
-}
-
 void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2])
 {
 	INT32 x, y;
@@ -3792,6 +3526,7 @@ void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
 	tex_downloaded = screenTextures[tex];
 }
 
+
 // Do screen fades!
 void GL_DoScreenWipe(int wipeStart, int wipeEnd)
 {
@@ -3866,184 +3601,120 @@ void GL_DoScreenWipe(int wipeStart, int wipeEnd)
 	tex_downloaded = screenTextures[wipeEnd];
 }
 
-void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize, boolean rewind)
+void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize)
 {
 	float xfix, yfix;
 	float fix[8];
+	float i;
 
 	if (gl_enable_screen_textures != 2)
 		return;
 
+	GLubyte color[4] = {255, 255, 255, 255};
+
+	float screenVerts[12] =
+	{
+		-1.0f, -1.0f, 1.0f,
+		-1.0f,  1.0f, 1.0f,
+		 1.0f,  1.0f, 1.0f,
+		 1.0f, -1.0f, 1.0f
+	};
+
 	const GLfloat scrwf = (float)screen_width;
-	const GLfloat scrhf = (float)screen_height;
+	const GLfloat scrwh = (float)screen_height;
 
 	xfix = 1/((float)screen_texsizew/scrwf);
-	yfix = 1/((float)screen_texsizeh/scrhf);
+	yfix = 1/((float)screen_texsizeh/scrwh);
 
-	// uses shaders to replicate the effect
-	// thanks RR for their heat effect being basically the vhs bars, made this lots easier lul
-	if (HWR_UseShader())
+	GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
+
+	// Slight fuzziness
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
+	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
+
+	uint32_t r = rand();
+
+	const float ystep = 2.f/scrwh * (float)vid.udup/4.f;
+
+	for (i = 0; i < 1; i += ystep)
 	{
-		// leveltime pauses with the game so we need to keep our own ticker here
-		static tic_t lleveltime = 0;
-		if (renderisnewtic) lleveltime++;
-		shader_vhs_time = (((float)(lleveltime-1)) + FIXED_TO_FLOAT(R_GetTimeFrac(RTF_CAMERA))) / TICRATE; // RTF_CAMERA interpolates during pause gladly...
+		// avoid calling rand thousands of times
+		r ^= r >> 13;
+		r ^= r >> 11;
+		r ^= r << 21;
 
-		// easier to account for within the shader
-		shader_vhs_rewind = rewind ? 1.0f : 0.0f;
+		fix[2] = (float)(r & 127) / -22000.f * xfix;
+		fix[0] = fix[2];
+		fix[6] = fix[0] + xfix;
+		fix[4] = fix[2] + xfix;
+		fix[1] = fix[7] = i*yfix;
+		fix[3] = fix[5] = (i+0.015f)*yfix;
 
-		fix[0] = fix[1] =
-		fix[2] = fix[7] = 0.0f;
+		screenVerts[1] = screenVerts[10] = 2*i - 1.0f;
+		screenVerts[4] = screenVerts[7] = screenVerts[1] + 0.03f;
 
-		fix[3] = fix[5] = yfix;
-		fix[4] = fix[6] = xfix;
-
-		GL_SetBlend(PF_NoDepthTest);
-
-		// Slight fuzziness
-		GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-		pglActiveTexture(GL_TEXTURE0);
-		pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
-		tex_downloaded = screenTextures[HWD_SCREENTEXTURE_VHS];
-
-		GL_SetShader(HWR_GetShaderFromTarget(SHADER_VHS_FUZZ));
-		GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
-		pglColor4ubv(white);
-
-		pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-		pglVertexPointer(3, GL_FLOAT, 0, defaultscreenVerts);
-		pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-		GL_UnSetShader();
-
-		// Upward and Downward bars
-		// theyre combined since the original shader also did this
-		// also saves us another screen copy + draw anyways
-		GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-		pglActiveTexture(GL_TEXTURE0);
-		pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
-		tex_downloaded = screenTextures[HWD_SCREENTEXTURE_VHS];
-
-		GL_SetShader(HWR_GetShaderFromTarget(SHADER_VHS_BAR));
-		GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
-		pglColor4ubv(white);
-
-		pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-		pglVertexPointer(3, GL_FLOAT, 0, defaultscreenVerts);
-		pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-		GL_UnSetShader();
-
-	}
-	else // fallback fixed function version, this is quite slow
-	{
-		float i;
-
-		GLubyte color[4] = {255, 255, 255, 255};
-
-		float screenVerts[12] =
-		{
-			-1.0f, -1.0f, 1.0f,
-			-1.0f,  1.0f, 1.0f,
-			1.0f,  1.0f, 1.0f,
-			1.0f, -1.0f, 1.0f
-		};
-
-		xfix = 1/((float)screen_texsizew/scrwf);
-		yfix = 1/((float)screen_texsizeh/scrhf);
-
-		GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
-
-		// Slight fuzziness
-		GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-		pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
-
-		uint32_t r = rand();
-
-		const float ystep = 2.f/scrhf * (float)vid.udup/4.f;
-
-		for (i = 0; i < 1; i += ystep)
-		{
-			// avoid calling rand thousands of times
-			r ^= r >> 13;
-			r ^= r >> 11;
-			r ^= r << 21;
-
-			fix[2] = (float)(r & 127) / -22000.f * xfix;
-			fix[0] = fix[2];
-			fix[6] = fix[0] + xfix;
-			fix[4] = fix[2] + xfix;
-			fix[1] = fix[7] = i*yfix;
-			fix[3] = fix[5] = (i+0.015f)*yfix;
-
-			screenVerts[1] = screenVerts[10] = 2*i - 1.0f;
-			screenVerts[4] = screenVerts[7] = screenVerts[1] + 0.03f;
-
-			pglColor4ubv(color);
-
-			pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-			pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
-			pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-		}
-
-		// Upward bar
-		GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-		pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
-
-		color[0] = color[1] = color[2] = 190;
-		color[3] = 250;
 		pglColor4ubv(color);
 
-		fix[0] = 0.0f;
-		fix[6] = xfix;
-		fix[2] = (float)updistort / scrwf * xfix;
-		fix[4] = fix[2] + fix[6];
-
-		screenVerts[1] = screenVerts[10] = 2.0f*upbary/scrhf - 1.0f;
-		screenVerts[4] = screenVerts[7] = screenVerts[1] + (float)barsize/scrhf;
-
-		fix[1] = fix[7] = (float)upbary/scrhf * yfix;
-		fix[3] = fix[5] = fix[1] + (float)barsize/2/scrhf * yfix;
-
-		pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-		pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
-		pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-		fix[1] = fix[7] += (fix[3] - fix[7])*2;
-		screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
-
-		pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-		pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
-		pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-		// Downward bar
-		GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
-		pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
-
-		fix[0] = 0.0f;
-		fix[6] = xfix;
-		fix[2] = (float)downdistort / scrwf * -xfix;
-		fix[4] = fix[2] + fix[6];
-
-		screenVerts[1] = screenVerts[10] = 2.0f*downbary/scrhf - 1.0f;
-		screenVerts[4] = screenVerts[7] = screenVerts[1] + (float)barsize/scrhf;
-
-		fix[1] = fix[7] = (float)downbary/scrhf * yfix;
-		fix[3] = fix[5] = fix[1] + (float)barsize/2/scrhf * yfix;
-
-		pglTexCoordPointer(2, GL_FLOAT, 0, fix);
-		pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
-		pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-		fix[1] = fix[7] += (fix[3] - fix[7])*2;
-		screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
-
 		pglTexCoordPointer(2, GL_FLOAT, 0, fix);
 		pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
 		pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 	}
+
+	// Upward bar
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
+	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
+
+	color[0] = color[1] = color[2] = 190;
+	color[3] = 250;
+	pglColor4ubv(color);
+
+	fix[0] = 0.0f;
+	fix[6] = xfix;
+	fix[2] = (float)updistort / scrwf * xfix;
+	fix[4] = fix[2] + fix[6];
+
+	screenVerts[1] = screenVerts[10] = 2.0f*upbary/scrwh - 1.0f;
+	screenVerts[4] = screenVerts[7] = screenVerts[1] + (float)barsize/scrwh;
+
+	fix[1] = fix[7] = (float)upbary/scrwh * yfix;
+	fix[3] = fix[5] = fix[1] + (float)barsize/2/scrwh * yfix;
+
+	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
+	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
+	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+	fix[1] = fix[7] += (fix[3] - fix[7])*2;
+	screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
+
+	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
+	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
+	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+	// Downward bar
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
+	pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
+
+	fix[0] = 0.0f;
+	fix[6] = xfix;
+	fix[2] = (float)downdistort / scrwf * -xfix;
+	fix[4] = fix[2] + fix[6];
+
+	screenVerts[1] = screenVerts[10] = 2.0f*downbary/scrwh - 1.0f;
+	screenVerts[4] = screenVerts[7] = screenVerts[1] + (float)barsize/scrwh;
+
+	fix[1] = fix[7] = (float)downbary/scrwh * yfix;
+	fix[3] = fix[5] = fix[1] + (float)barsize/2/scrwh * yfix;
+
+	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
+	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
+	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+	fix[1] = fix[7] += (fix[3] - fix[7])*2;
+	screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
+
+	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
+	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
+	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 }
 
 // Create a texture from the screen.
@@ -4051,19 +3722,10 @@ void GL_MakeScreenTexture(int tex)
 {
 	boolean firstTime;
 	static GLint lastfiltermode[NUMSCREENTEXTURES] = {-1, -1, -1, -1, -1};
-#ifdef USE_FBO_OGL
-	const boolean msaa_fbo = (framebufferobject.bound && framebufferobject.msaa);
-#endif
 
 	if (!gl_enable_screen_textures)
 		return;
 
-#ifdef USE_FBO_OGL
-	// cant read from the msaa fbo, so gotta blit it first into either the single sample fbo or the screen framebuffer....
-	if (msaa_fbo)
-		GL_FBO_Resolve(GL_COLOR_BUFFER_BIT);
-#endif
-
 	firstTime = (screenTextures[tex] == 0);
 
 	// Create screen texture
@@ -4097,11 +3759,6 @@ void GL_MakeScreenTexture(int tex)
 	}
 
 	tex_downloaded = screenTextures[tex];
-
-#ifdef USE_FBO_OGL
-	if (msaa_fbo)
-		GL_FBO_Enable();
-#endif
 }
 
 void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)

src/i_video.h

@@ -118,8 +118,11 @@ void I_UpdateNoVsync(void);
 */
 void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
 
+
 UINT32 I_GetRefreshRate(void);
 
+boolean I_CheckNativeRes(void);
+
 void I_SetBorderlessWindow(void);
 
 #ifdef USE_FBO_OGL

src/lua_maplib.c

@@ -18,7 +18,6 @@
 #include "p_slopes.h"
 #include "r_main.h"
 
-#include "lua_udatalib.h"
 #include "lua_script.h"
 #include "lua_libs.h"
 #include "lua_hud.h" // hud_running errors
@@ -256,15 +255,6 @@ static const char *const vector_opt[] = {
 static const char *const array_opt[] ={"iterate",NULL};
 static const char *const valid_opt[] ={"valid",NULL};
 
-#define pushsubsector(L, subsector) LUA_PushUserdata(L, subsector, META_SUBSECTOR)
-int udatalib_getter_subsector(lua_State *L)
-UDATALIB_SIMPLE_GETTER(subsector_t*, pushsubsector)
-#undef pushsubsector
-
-#define pushslope(L, slope) LUA_PushUserdata(L, slope, META_SLOPE)
-int udatalib_getter_slope(lua_State *L)
-UDATALIB_SIMPLE_GETTER(pslope_t*, pushslope)
-#undef pushslope
 // iterates through a sector's thinglist!
 static int lib_iterateSectorThinglist(lua_State *L)
 {

src/lua_udatalib.c

@@ -1,137 +0,0 @@
-// SONIC ROBO BLAST 2 KART SATURN
-//-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Indev.
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file  lua_udatalib.c
-/// \brief Implementation of lua userdata object metatables based on getter/setter functions
-
-#include "doomtype.h"
-#include "m_fixed.h"
-#include "lua_udatalib.h"
-
-// Getters
-int udatalib_getter_fixed(lua_State *L)
-UDATALIB_SIMPLE_GETTER(fixed_t, lua_pushinteger)
-
-int udatalib_getter_angle(lua_State *L)
-UDATALIB_SIMPLE_GETTER(angle_t, lua_pushangle)
-
-int udatalib_getter_uint8(lua_State *L)
-UDATALIB_SIMPLE_GETTER(UINT8, lua_pushinteger)
-
-int udatalib_getter_sint8(lua_State *L)
-UDATALIB_SIMPLE_GETTER(SINT8, lua_pushinteger)
-
-int udatalib_getter_uint16(lua_State *L)
-UDATALIB_SIMPLE_GETTER(UINT16, lua_pushinteger)
-
-int udatalib_getter_int16(lua_State *L)
-UDATALIB_SIMPLE_GETTER(INT16, lua_pushinteger)
-
-int udatalib_getter_uint32(lua_State *L)
-UDATALIB_SIMPLE_GETTER(UINT32, lua_pushinteger)
-
-int udatalib_getter_int32(lua_State *L)
-UDATALIB_SIMPLE_GETTER(INT32, lua_pushinteger)
-
-int udatalib_getter_uint64(lua_State *L)
-UDATALIB_SIMPLE_GETTER(UINT64, lua_pushinteger)
-
-int udatalib_getter_int64(lua_State *L)
-UDATALIB_SIMPLE_GETTER(INT64, lua_pushinteger)
-
-int udatalib_getter_string(lua_State *L)
-UDATALIB_SIMPLE_GETTER(const char*, lua_pushstring)
-
-int udatalib_getter_boolean(lua_State *L)
-UDATALIB_SIMPLE_GETTER(boolean, lua_pushboolean)
-
-int udatalib_getter_spritenum(lua_State *L)
-UDATALIB_SIMPLE_GETTER(spritenum_t, lua_pushinteger)
-
-int udatalib_getter_tic(lua_State *L)
-UDATALIB_SIMPLE_GETTER(tic_t, lua_pushinteger)
-
-// Setters
-int udatalib_setter_fixed(lua_State *L)
-UDATALIB_SIMPLE_SETTER(fixed_t, luaL_checkfixed)
-
-int udatalib_setter_angle(lua_State *L)
-UDATALIB_SIMPLE_SETTER(angle_t, luaL_checkangle)
-
-int udatalib_setter_uint8(lua_State *L)
-UDATALIB_SIMPLE_SETTER(UINT8, (UINT8)luaL_checkinteger)
-
-int udatalib_setter_sint8(lua_State *L)
-UDATALIB_SIMPLE_SETTER(SINT8, luaL_checkinteger)
-
-int udatalib_setter_uint16(lua_State *L)
-UDATALIB_SIMPLE_SETTER(UINT16, (UINT16)luaL_checkinteger)
-
-int udatalib_setter_int16(lua_State *L)
-UDATALIB_SIMPLE_SETTER(INT16, luaL_checkinteger)
-
-int udatalib_setter_uint32(lua_State *L)
-UDATALIB_SIMPLE_SETTER(UINT32, (UINT32)luaL_checkinteger)
-
-int udatalib_setter_int32(lua_State *L)
-UDATALIB_SIMPLE_SETTER(INT32, luaL_checkinteger)
-
-int udatalib_setter_uint64(lua_State *L)
-UDATALIB_SIMPLE_SETTER(UINT64, (UINT64)luaL_checkinteger)
-
-int udatalib_setter_int64(lua_State *L)
-UDATALIB_SIMPLE_SETTER(INT64, luaL_checkinteger)
-
-int udatalib_setter_string(lua_State *L)
-UDATALIB_SIMPLE_SETTER(const char*, luaL_checkstring)
-
-int udatalib_setter_boolean(lua_State *L)
-UDATALIB_SIMPLE_SETTER(boolean, luaL_checkboolean)
-
-// ffs
-int udatalib_setter_boolean_nocheck(lua_State *L)
-UDATALIB_SIMPLE_SETTER(boolean, lua_toboolean)
-
-int udatalib_setter_spritenum(lua_State *L)
-UDATALIB_SIMPLE_SETTER(spritenum_t, luaL_checkinteger)
-
-int udatalib_setter_tic(lua_State *L)
-UDATALIB_SIMPLE_SETTER(tic_t, (tic_t)luaL_checkinteger)
-
-
-void udatalib_addfield(lua_State *L, int mt, udata_field_t field)
-{
-    int idx = abs_index(L, mt);
-
-    lua_createtable(L, 2, 0); // Push table
-
-    lua_pushinteger(L, field.offset); // Push offset
-    lua_pushcclosure(L, field.getter, 1); // Pop offset, push closure
-
-    lua_rawseti(L, -2, UDATALIB_GETTER); // Pop closure, add to table
-
-    lua_pushinteger(L, field.offset); // Push offset
-    lua_pushcclosure(L, field.setter, 1); // Pop offset, push closure
-
-    lua_rawseti(L, -2, UDATALIB_SETTER); // Pop closure, add to table
-
-    lua_pushstring(L, field.name); // Push field name
-    lua_pushvalue(L, -2); // Copy table
-    lua_rawset(L, idx); // Pop field name and table, add to metatable
-
-    lua_pop(L, 1); // Pop field table
-}
-
-void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[])
-{
-    for (unsigned i = 0; fields[i].name != NULL; ++i)
-    {
-        udatalib_addfield(L, mt, fields[i]);
-        //CONS_Printf("Add field name=%s, offset=%d, getter=%p, setter=%p\n", fields[i].name, fields[i].offset, fields[i].getter, fields[i].setter);
-    }
-}

src/lua_udatalib.h

@@ -1,114 +0,0 @@
-// SONIC ROBO BLAST 2 KART SATURN
-//-----------------------------------------------------------------------------
-// Copyright (C) 2025 by Indev.
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file  lua_udatalib.h
-/// \brief Implementation of lua userdata object metatables based on getter/setter functions
-
-#ifndef __LUA_UDATALIB_H__
-#define __LUA_UDATALIB_H__
-
-#include "doomdef.h"
-#include "lua_script.h"
-#include "lua_libs.h"
-#include "fastcmp.h"
-
-// Indices in getter/setter tables for fields
-#define UDATALIB_GETTER 1
-#define UDATALIB_SETTER 2
-
-typedef struct udata_field_s {
-    const char *name;
-    size_t offset;
-    lua_CFunction getter;
-    lua_CFunction setter;
-} udata_field_t;
-
-// Simple setters and getters, for situations where getter is simply
-// "return obj.field" and setter is "obj.field = value"
-int udatalib_getter_fixed(lua_State *L);
-int udatalib_getter_angle(lua_State *L);
-int udatalib_getter_uint8(lua_State *L);
-int udatalib_getter_sint8(lua_State *L);
-int udatalib_getter_uint16(lua_State *L);
-int udatalib_getter_int16(lua_State *L);
-int udatalib_getter_uint32(lua_State *L);
-int udatalib_getter_int32(lua_State *L);
-int udatalib_getter_uint64(lua_State *L);
-int udatalib_getter_int64(lua_State *L);
-int udatalib_getter_string(lua_State *L);
-int udatalib_getter_boolean(lua_State *L);
-int udatalib_getter_spritenum(lua_State *L);
-int udatalib_getter_mobj(lua_State *L);
-int udatalib_getter_subsector(lua_State *L);
-int udatalib_getter_mobjtype(lua_State *L);
-int udatalib_getter_player(lua_State *L);
-int udatalib_getter_mapthing(lua_State *L);
-int udatalib_getter_slope(lua_State *L);
-int udatalib_getter_cmd(lua_State *L);
-int udatalib_getter_playerstate(lua_State *L);
-int udatalib_getter_powers(lua_State *L);
-int udatalib_getter_kartstuff(lua_State *L);
-int udatalib_getter_pflags(lua_State *L);
-int udatalib_getter_panim(lua_State *L);
-int udatalib_getter_tic(lua_State *L);
-
-int udatalib_setter_fixed(lua_State *L);
-int udatalib_setter_angle(lua_State *L);
-int udatalib_setter_uint8(lua_State *L);
-int udatalib_setter_sint8(lua_State *L);
-int udatalib_setter_uint16(lua_State *L);
-int udatalib_setter_int16(lua_State *L);
-int udatalib_setter_uint32(lua_State *L);
-int udatalib_setter_int32(lua_State *L);
-int udatalib_setter_uint64(lua_State *L);
-int udatalib_setter_int64(lua_State *L);
-int udatalib_setter_string(lua_State *L);
-int udatalib_setter_boolean(lua_State *L);
-int udatalib_setter_boolean_nocheck(lua_State *L);
-int udatalib_setter_spritenum(lua_State *L);
-int udatalib_setter_mobj(lua_State *L);
-int udatalib_setter_playerstate(lua_State *L);
-int udatalib_setter_pflags(lua_State *L);
-int udatalib_setter_panim(lua_State *L);
-int udatalib_setter_tic(lua_State *L);
-
-// Adds setter and getter for field and stores it as field.name..".get" and
-// field.name..".set" in table at index mt. (metatable, usually)
-void udatalib_addfield(lua_State *L, int mt, udata_field_t field);
-
-// Convinience function to add array of fields at once.
-void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[]);
-
-// I miss C++ template functons :(
-
-// Get pointer to field value within getter or setter
-#define UDATALIB_GETFIELD(type, field) \
-{ \
-    size_t offset = lua_tointeger(L, lua_upvalueindex(1)); \
-    field = (type*)((uint8_t*)lua_touserdata(L, 1) + offset); \
-}
-
-// Creates implementation for simple getter and setter. Super lazy, yes.
-// Assumes userdata is a pointer to actual data. Maybe not really safe.
-#define UDATALIB_SIMPLE_GETTER(type, pushf) \
-{ \
-    type *field; \
-    UDATALIB_GETFIELD(type, field) \
-    pushf(L, *field); \
-    return 1; \
-}
-
-#define UDATALIB_SIMPLE_SETTER(type, checkf) \
-{ \
-    type *field; \
-    UDATALIB_GETFIELD(type, field) \
-    *field = checkf(L, 2); \
-    return 0; \
-}
-
-#endif

src/m_menudefs.c

@@ -1004,7 +1004,7 @@ static menuitem_t OP_ExpOptionsMenu[] =
 #ifdef HWRENDER
 	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 95},
 #ifdef USE_FBO_OGL
-	{IT_STRING | IT_CVAR, 	NULL, "FBO support", 					&cv_glframebuffer, 			100},
+	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			100},
 	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		110},
 	{IT_DISABLED, 			NULL, "", 								NULL,     			 		120}, // dummy text
 #else
@@ -1030,7 +1030,7 @@ static const char* OP_ExpTooltips[] =
 #ifdef HWRENDER
 	"Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!",
 #ifdef USE_FBO_OGL
-	"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nThis can be set to automatically enable if the game resolution\nis higher than the current Display Resolution\nor enabled at all times.\nThis may improve performance in some cases.\nRequires a GPU with atleast OpenGL 2.1 support.",
+	"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.",
 #endif
 	"Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.",
 #endif

src/r_defs.h

@@ -504,9 +504,6 @@ typedef struct subsector_s
 	void *splats; // floorsplat_t list
 #endif
 	size_t validcount;
-#ifdef HWRENDER
-	boolean hashorizon; // not really needed for software, this stuff works differently there
-#endif
 } subsector_t;
 
 // Sector list node showing all sectors an object appears in.

src/sdl/i_video.c

@@ -113,6 +113,10 @@ consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE|CV_CALL,
 
 static void Impl_SetVsync(void);
 
+static INT32 desktopwidth = 0, desktopheight = 0;
+
+static void I_CheckDesktopRes(void);
+
 // synchronize page flipping with screen refresh
 consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL};
 static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -508,10 +512,10 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 		return;
 	}
 
-	if (windowmoved)
+	if (windowmoved && rendermode == render_opengl)
 	{
+		I_CheckDesktopRes();
 #ifdef USE_FBO_OGL
-		if (rendermode == render_opengl)
 			I_CheckDownSampleState(false);
 #endif
 		windowmoved = SDL_FALSE;
@@ -1219,7 +1223,9 @@ static void VID_Command_ModeList_f(void)
 	// List windowed modes
 	INT32 i = 0;
 
-	CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n");
+	CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n"
+	"Under opengl, fullscreen only supports native desktop resolution.\n"
+	"Under software, the mode is stretched up to desktop resolution.\n");
 
 	for (i = 0; i < MAXWINMODES; i++)
 	{
@@ -1245,6 +1251,44 @@ static void VID_Command_Mode_f (void)
 		setmodeneeded = modenum+1; // request vid mode change
 }
 
+// Get the desktop resolution from the current display the gamewindow resides on
+static void I_CheckDesktopRes(void)
+{
+	int currentDisplayIndex = -1;
+	SDL_DisplayMode curmode;
+
+	// just fallback to game res ig?
+	desktopwidth = vid.width;
+	desktopheight = vid.height;
+
+	currentDisplayIndex = SDL_GetWindowDisplayIndex(window);
+
+	// No valid index
+	if (currentDisplayIndex < 0)
+	{
+		return;
+	}
+
+	if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) < 0)
+	{
+		return;
+	}
+
+	desktopwidth = curmode.w;
+	desktopheight = curmode.h;
+}
+
+// Check if the game resolution matches the desktop resolution
+boolean I_CheckNativeRes(void)
+{
+	return (vid.width == desktopwidth && vid.height == desktopheight);
+}
+
+static boolean I_CheckAboveDesktopRes(INT32 width, INT32 height)
+{
+	return (width > desktopwidth || height > desktopheight);
+}
+
 #ifdef USE_FBO_OGL
 static boolean vid_downsampling = false;
 
@@ -1263,24 +1307,16 @@ void I_CheckDownSampleState(boolean forcerefresh)
 	}
 
 	// no sense to do this crap if we cant benefit from it
-	boolean newdownsamplestate = false;
-
-	if (cv_glframebuffer.value && (cv_glscreentextures.value == 2))
-	{
-		int sdlw, sdlh;
-		SDL_GetWindowSize(window, &sdlw, &sdlh);
-		if (vid.width > sdlw || vid.height > sdlh)
-			newdownsamplestate = true;
-	}
+	const boolean newdownsamplestate = cv_glframebuffer.value && (cv_glscreentextures.value == 2) && I_CheckAboveDesktopRes(vid.width, vid.height);
 
 	// state changed or fbo was toggled
 	if (vid_downsampling != newdownsamplestate || forcerefresh)
 	{
-		//printf("downsample changed from %d to %d\n", vid_downsampling, newdownsamplestate);
-		// needs to be reset before refreshing the gl surface!
-		vid_downsampling = newdownsamplestate;
+		//printf("downsample changed from %d to %d\n", vid_downsampling, curdownsamplestate);
 		OglSdlSurface(vid.width, vid.height);
 	}
+
+	vid_downsampling = newdownsamplestate;
 }
 #endif
 
@@ -1310,8 +1346,8 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 			}
 
 			// Reposition window only in windowed mode
-			SDL_SetWindowSize(window, width, height);
 			const int windowpos = SDL_GetWindowDisplayIndex(window);
+			SDL_SetWindowSize(window, width, height);
 			SDL_SetWindowPosition(window,
 				SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos),
 				SDL_WINDOWPOS_CENTERED_DISPLAY(windowpos)
@@ -1334,6 +1370,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
+		I_CheckDesktopRes();
 #ifdef USE_FBO_OGL
 		I_CheckDownSampleState(false);
 #endif
@@ -1531,7 +1568,7 @@ void VID_PrepareModeList(void)
 static UINT32 refresh_rate;
 static UINT32 VID_GetRefreshRate(void)
 {
-	int index;
+	int index = SDL_GetWindowDisplayIndex(window);
 	SDL_DisplayMode m;
 
 	if (SDL_WasInit(SDL_INIT_VIDEO) == 0)
@@ -1540,8 +1577,6 @@ static UINT32 VID_GetRefreshRate(void)
 		return 0;
 	}
 
-	index = SDL_GetWindowDisplayIndex(window);
-
 	if (SDL_GetDesktopDisplayMode(index, &m) != 0)
 	{
 		// Error has occurred.

src/sdl/ogl_sdl.c

@@ -65,7 +65,7 @@ PFNglGetString pglGetString;
 #ifdef USE_FBO_OGL
 boolean UseScreenFBO(void)
 {
-	return (supportFBO && cv_glframebuffer.value && (cv_glscreentextures.value == 2) && (cv_glframebuffer.value == 2 || I_IsDownsampling()));
+	return (supportFBO && cv_glframebuffer.value && I_IsDownsampling() && (cv_glscreentextures.value == 2));
 }
 #endif
 
@@ -225,6 +225,7 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 void OglSdlFinishUpdate(SDL_Window *window)
 {
 	int sdlw, sdlh;
+
 #ifdef USE_FBO_OGL
 	const boolean usefbo = UseScreenFBO();
 #endif
@@ -261,10 +262,11 @@ void OglSdlFinishUpdate(SDL_Window *window)
 
 	// Sryder:	We need to draw the final screen texture again into the other buffer in the original position so that
 	//			effects that want to take the old screen can do so after this
+	// well we dont need it on native res it seems
 #ifdef USE_FBO_OGL
-	if (!usefbo && (realwidth != sdlw || realheight != sdlh)) // not needed if fbo is in use
+	if (!usefbo && (!I_CheckNativeRes() || WipeInAction))
 #else
-	if (realwidth != sdlw || realheight != sdlh) // this is not needed if the render size matches window size
+	if (!I_CheckNativeRes() || WipeInAction)
 #endif
 		HWR_DrawScreenFinalTexture(realwidth, realheight);
 }

src/v_video.c

@@ -1882,7 +1882,7 @@ void V_DrawVhsEffect(boolean rewind)
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
-		HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize, rewind);
+		HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize);
 		return;
 	}
 #endif
@@ -3619,7 +3619,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 
 			for (y = yoffset; y < yoffset+viewheight; y++)
 			{
-				sine = (FINESINE(disStart) * 5) >> FRACBITS;
+				sine = (FINESINE(disStart)*5)>>FRACBITS;
 				newpix = abs(sine);
 
 				if (sine < 0)
@@ -3659,8 +3659,8 @@ void V_DoPostProcessor(INT32 view, INT32 param)
 					tmpscr[y*vid.width + x] = srcscr[y*vid.width+newpix]; // *(transme + (srcscr[y*vid.width+x]<<8) + srcscr[y*vid.width+newpix]);
 				}*/
 
-				disStart += 22; // the offset into the displacement map, increment each game loop
-				disStart &= FINEMASK; // clip it to FINEMASK
+				disStart += 22;//the offset into the displacement map, increment each game loop
+				disStart &= FINEMASK; //clip it to FINEMASK
 			}
 
 			UINT8 *tmp = tmpscr;