From ec4140a9d29eaf1bb3c6328eb5c7ba52d5fbe42d Mon Sep 17 00:00:00 2001 From: lug420 Date: Mon, 11 Sep 2023 20:00:09 +0200 Subject: [PATCH] remove custom shader toggle + clear colormaps when toggle palette shader the custom shader toggle often broke stuff when toggled while palette shader was active also clearing colormaps when toggling palette shader is ugly midlevel but atleast it doesent visually break completely def need to somehow reinitialze colormaps instead or smth --- src/hardware/hw_main.c | 13 ++++++++----- src/hardware/hw_main.h | 2 +- src/m_menu.c | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 173f423bf..1433087eb 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -30,6 +30,7 @@ #include "../r_fps.h" #include "../r_state.h" #include "../r_local.h" +#include "../r_data.h" #include "../r_patch.h" // a mystery as to what this is for #include "../r_bsp.h" // R_NoEncore #include "../r_main.h" // cv_fov @@ -66,7 +67,7 @@ int gr_use_palette_shader = 0; static void CV_filtermode_ONChange(void); static void CV_anisotropic_ONChange(void); static void CV_screentextures_ONChange(void); -static void CV_useCustomShaders_ONChange(void); +//static void CV_useCustomShaders_ONChange(void); static void CV_grpaletteshader_OnChange(void); static CV_PossibleValue_t grfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"}, @@ -88,7 +89,6 @@ consvar_t cv_grcorrecttricks = {"gr_correcttricks", "Off", 0, CV_OnOff, NULL, 0, consvar_t cv_grsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_grbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_grpaletteshader = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_grpaletteshader_OnChange, 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"}, @@ -120,7 +120,9 @@ static INT32 current_bsp_culling_distance = 0; consvar_t cv_grscreentextures = {"gr_screentextures", "On", CV_CALL, CV_OnOff, CV_screentextures_ONChange, 0, NULL, NULL, 0, 0, NULL}; - consvar_t cv_grusecustomshaders = {"gr_usecustomshaders", "Yes", CV_CALL|CV_SAVE, CV_OnOff, CV_useCustomShaders_ONChange, 0, NULL, NULL, 0, 0, NULL}; +//consvar_t cv_grusecustomshaders = {"gr_usecustomshaders", "Yes", CV_CALL|CV_SAVE, CV_OnOff, CV_useCustomShaders_ONChange, 0, NULL, NULL, 0, 0, NULL}; // rip in peace sweet prince + +consvar_t cv_grpaletteshader = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_grpaletteshader_OnChange, 0, NULL, NULL, 0, 0, NULL}; static void CV_filtermode_ONChange(void) { @@ -137,11 +139,11 @@ static void CV_screentextures_ONChange(void) HWD.pfnSetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_grscreentextures.value); } -static void CV_useCustomShaders_ONChange(void) +/*static void CV_useCustomShaders_ONChange(void) { if (rendermode == render_opengl) HWD.pfnInitCustomShaders(); -} +}*/ static void CV_grpaletteshader_OnChange(void) { @@ -149,6 +151,7 @@ static void CV_grpaletteshader_OnChange(void) { HWD.pfnSetSpecialState(HWD_SET_PALETTE_SHADER_ENABLED, cv_grpaletteshader.value); gr_use_palette_shader = cv_grpaletteshader.value; + R_ClearColormaps(); } } diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 019b921c6..37027da82 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -180,7 +180,7 @@ extern consvar_t cv_grfakecontrast; extern consvar_t cv_grfallbackplayermodel; extern consvar_t cv_grbatching; extern consvar_t cv_grrenderdistance; -extern consvar_t cv_grusecustomshaders; +//extern consvar_t cv_grusecustomshaders; extern consvar_t cv_grpaletteshader; extern consvar_t cv_grportals; extern consvar_t cv_nostencil; diff --git a/src/m_menu.c b/src/m_menu.c index 980a4c694..fa4210c00 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1347,7 +1347,8 @@ static menuitem_t OP_OpenGLOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 5}, {IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 15}, {IT_STRING|IT_CVAR, NULL, "Shaders", &cv_grshaders, 25}, - {IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 35}, + //{IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 35}, // rip in peace sweet prince + {IT_STRING|IT_CVAR, NULL, "Palette Rendering", &cv_grpaletteshader, 35}, {IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 45}, {IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 65}, @@ -1407,7 +1408,6 @@ static menuitem_t OP_SoundOptionsMenu[] = {IT_STRING|IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 155} }; - static menuitem_t OP_SoundAdvancedMenu[] = { #ifdef HAVE_OPENMPT