From 739e9716ab29abf39c2a8e57ca4dd42e478ef393 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 22 Jan 2024 18:25:51 +0100 Subject: [PATCH] add toggle for custom shaders it seems better like this, atleast thats how hannu set it up --- src/hardware/hw_main.c | 24 ++++-------------------- src/hardware/hw_main.h | 1 - src/hardware/hw_shaders.c | 5 +---- src/hardware/r_opengl/r_opengl.c | 3 +-- 4 files changed, 6 insertions(+), 27 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index f06db5841..b41855db4 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -71,7 +71,6 @@ static boolean gr_palette_rendering_state = false; 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_grshaders_OnChange(void); static void CV_grpaletterendering_OnChange(void); static void CV_grpalettedepth_OnChange(void); @@ -140,9 +139,9 @@ static INT32 current_bsp_culling_distance = 0; // - full screen scaling (use native resolution or windowed mode to avoid this) consvar_t cv_grscreentextures = {"gr_screentextures", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_screentextures_ONChange, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_grshaders = {"gr_shaders", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_grshaders_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}; + +static CV_PossibleValue_t grshaders_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Ignore custom shaders"}, {0, NULL}}; +consvar_t cv_grshaders = {"gr_shaders", "On", CV_CALL|CV_SAVE, grshaders_cons_t, CV_grshaders_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_grpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_grpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -192,18 +191,6 @@ static void CV_grshaders_OnChange(void) } } -/*static void CV_useCustomShaders_ONChange(void) // should we do a call to HWR_TogglePaletteRendering here aswell in pal rendering mode? -{ - ONLY_IF_GL_LOADED - if (HWR_UseShader() && cv_grusecustomshaders.value) - { - HWR_LoadAllCustomShaders(); - HWR_CompileShaders(); - } - else if (HWR_UseShader() && !cv_grusecustomshaders.value) - HWR_CompileShaders(); -}*/ - static void CV_grpaletterendering_OnChange(void) { ONLY_IF_GL_LOADED @@ -6430,7 +6417,6 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_grshearing); CV_RegisterVar(&cv_grshaders); - //CV_RegisterVar(&cv_grusecustomshaders); CV_RegisterVar(&cv_grportals); CV_RegisterVar(&cv_nostencil); @@ -6464,9 +6450,7 @@ void HWR_Startup(void) gr_shadersavailable = HWR_InitShaders(); HWR_SetShaderState(); - - //if (cv_grusecustomshaders.value) - HWR_LoadAllCustomShaders(); + HWR_LoadAllCustomShaders(); HWR_TogglePaletteRendering(); diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index 9d6228d6d..4725c720b 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -191,7 +191,6 @@ extern consvar_t cv_grhorizonlines; extern consvar_t cv_grfallbackplayermodel; extern consvar_t cv_grbatching; extern consvar_t cv_grrenderdistance; -//extern consvar_t cv_grusecustomshaders; extern consvar_t cv_grpaletterendering; extern consvar_t cv_grpalettedepth; extern consvar_t cv_grflashpal; diff --git a/src/hardware/hw_shaders.c b/src/hardware/hw_shaders.c index 7cf10fbe5..f9c755b0d 100644 --- a/src/hardware/hw_shaders.c +++ b/src/hardware/hw_shaders.c @@ -400,7 +400,7 @@ int HWR_GetShaderFromTarget(int shader_target) // - custom shaders are enabled // - custom shaders are allowed by the server if (custom_shader != -1 && gl_shaders[custom_shader].compiled && - cv_grshaders.value) + cv_grshaders.value == 1) return custom_shader; else return gl_shadertargets[shader_target].base_shader; @@ -456,9 +456,6 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3) if (!HWR_UseShader()) return; - - //if (!cv_grusecustomshaders.value) - //return; lump = HWR_FindShaderDefs(wadnum); if (lump == INT16_MAX) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 08631491d..05dfa6505 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -33,8 +33,7 @@ #include "../hw_main.h" #include "../hw_batching.h" -// Eeeeh not sure is this right way, but it works < sry :c -extern consvar_t cv_grusecustomshaders; +// Eeeeh not sure is this right way, but it works < sry :c < sry again it had to go :c extern fixed_t fovtan; // also extremely bad, I'm just too lazy!!!