From 6f8342b9a86de7bb3feb0ded014a98d764657ca3 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 23 Oct 2024 21:33:04 +0200 Subject: [PATCH] remove cv_splitwallfix tbh i dont think anyone even knows about this, never heard any complains, never had any issues, neither visually or performancewise. its just clutter at this point --- src/hardware/hw_main.c | 27 ++++++--------------------- src/hardware/hw_main.h | 1 - src/m_menu.c | 5 ----- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 96662c3cc..929eb78e3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -106,8 +106,6 @@ consvar_t cv_grbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL consvar_t cv_grframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_grframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL}; #endif -consvar_t cv_splitwallfix = {"splitwallfix", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; - static CV_PossibleValue_t grrenderdistance_cons_t[] = { {0, "Max"}, {1, "1024"}, {2, "2048"}, {3, "4096"}, {4, "6144"}, {5, "8192"}, {6, "12288"}, {7, "16384"}, {0, NULL}}; @@ -1094,7 +1092,7 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, // Lactozilla: If both heights of a side lay on the same position, then this wall is a triangle. // To avoid division by zero, which would result in a NaN, we check if the vertical difference // between the two vertices is not zero. - if (fpclassify(top - bot) == FP_ZERO && cv_splitwallfix.value) + if (fpclassify(top - bot) == FP_ZERO) pegmul = 0.0; else pegmul = (pegb - pegt) / (top - bot); @@ -1104,7 +1102,7 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, endpegt = wallVerts[2].t; endpegb = wallVerts[1].t; - if (fpclassify(endtop - endbot) == FP_ZERO && cv_splitwallfix.value) + if (fpclassify(endtop - endbot) == FP_ZERO) endpegmul = 0.0; else endpegmul = (endpegb - endpegt) / (endtop - endbot); @@ -1177,13 +1175,10 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, endbheight = endrealbot; } - if (cv_splitwallfix.value) - { - if (endbheight > endtop) - endbot = endtop; - } + if (endbheight > endtop) + endbot = endtop; - if ((endbheight >= endtop && bheight >= top && !cv_splitwallfix.value) || (bheight >= top && cv_splitwallfix.value)) + if (bheight >= top) continue; // Found a break @@ -1193,15 +1188,7 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, if (bot < realbot) bot = realbot; - if (cv_splitwallfix.value) - endbot = min(max(endbheight, endrealbot), endtop); - else - { - endbot = endbheight; - - if (endbot < endrealbot) - endbot = endrealbot; - } + endbot = min(max(endbheight, endrealbot), endtop); Surf->PolyColor.s.alpha = alpha; @@ -5689,8 +5676,6 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_grbatching); - CV_RegisterVar(&cv_splitwallfix); - CV_RegisterVar(&cv_grrenderdistance); CV_RegisterVar(&cv_grfakecontrast); diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 2abb6dda6..5c3877e56 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -152,7 +152,6 @@ extern consvar_t cv_grshaders; #ifdef USE_FBO_OGL extern consvar_t cv_grframebuffer; #endif -extern consvar_t cv_splitwallfix; extern consvar_t cv_grshearing; extern consvar_t cv_grfov; extern consvar_t cv_grmdls; diff --git a/src/m_menu.c b/src/m_menu.c index 94b5f8f3b..b2a61831d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1498,8 +1498,6 @@ static menuitem_t OP_ExpOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_grframebuffer, 110}, #endif {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_grpalettedepth, 130}, - - {IT_STRING | IT_CVAR, NULL, "Splitwall/Slope texture fix", &cv_splitwallfix, 150}, #endif }; @@ -1517,7 +1515,6 @@ static const char* OP_ExpTooltips[] = "Allows the game to downsample from a higher resolution than your display\nin OpenGL renderer mode. Requires a GPU with atleast OpenGL 3.0 support.", #endif "Change the depth of the Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.", - "Fixes issues that resulted in Textures sticking from the ground sometimes.\n This may be CPU heavy and result in worse performance in some cases.", #endif }; @@ -1535,7 +1532,6 @@ enum op_exp_fbo, #endif op_exp_paldepth, - op_exp_spltwal, #endif }; @@ -4724,7 +4720,6 @@ void M_Init(void) #ifdef USE_FBO_OGL OP_ExpOptionsMenu[op_exp_fbo].status = IT_DISABLED; #endif - OP_ExpOptionsMenu[op_exp_spltwal].status = IT_DISABLED; } if (rendermode == render_opengl)