From ef24b9e6fb67d5b385b813e5b48b5f8140a411a3 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Tue, 7 Nov 2023 01:14:10 +1000 Subject: [PATCH] vid: remove obsolete cvars Signed-off-by: bones_was_here --- gl_rmain.c | 10 ---------- render.h | 2 -- vid.h | 1 - vid_sdl.c | 1 - vid_shared.c | 2 -- 5 files changed, 16 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index c845217d..e5bd8576 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -156,10 +156,6 @@ cvar_t gl_skyclip = {CF_CLIENT, "gl_skyclip", "4608", "nehahra farclip distance cvar_t r_texture_dds_load = {CF_CLIENT | CF_ARCHIVE, "r_texture_dds_load", "0", "load compressed dds/filename.dds texture instead of filename.tga, if the file exists (requires driver support)"}; cvar_t r_texture_dds_save = {CF_CLIENT | CF_ARCHIVE, "r_texture_dds_save", "0", "save compressed dds/filename.dds texture when filename.tga is loaded, so that it can be loaded instead next time"}; -cvar_t r_textureunits = {CF_CLIENT, "r_textureunits", "32", "number of texture units to use in GL 1.1 and GL 1.3 rendering paths"}; -static cvar_t gl_combine = {CF_CLIENT | CF_READONLY, "gl_combine", "1", "indicates whether the OpenGL 1.3 rendering path is active"}; -static cvar_t r_glsl = {CF_CLIENT | CF_READONLY, "r_glsl", "1", "indicates whether the OpenGL 2.0 rendering path is active"}; - cvar_t r_usedepthtextures = {CF_CLIENT | CF_ARCHIVE, "r_usedepthtextures", "1", "use depth texture instead of depth renderbuffer where possible, uses less video memory but may render slower (or faster) depending on hardware"}; cvar_t r_viewfbo = {CF_CLIENT | CF_ARCHIVE, "r_viewfbo", "0", "enables use of an 8bit (1) or 16bit (2) or 32bit (3) per component float framebuffer render, which may be at a different resolution than the video mode"}; cvar_t r_rendertarget_debug = {CF_CLIENT, "r_rendertarget_debug", "-1", "replaces the view with the contents of the specified render target (by number - note that these can fluctuate depending on scene)"}; @@ -3072,9 +3068,6 @@ static void gl_main_start(void) { case RENDERPATH_GL32: case RENDERPATH_GLES2: - Cvar_SetValueQuick(&r_textureunits, MAX_TEXTUREUNITS); - Cvar_SetValueQuick(&gl_combine, 1); - Cvar_SetValueQuick(&r_glsl, 1); r_loadnormalmap = true; r_loadgloss = true; r_loadfog = false; @@ -3336,8 +3329,6 @@ void GL_Main_Init(void) Cvar_RegisterVariable(&r_transparent_sortarraysize); Cvar_RegisterVariable(&r_texture_dds_load); Cvar_RegisterVariable(&r_texture_dds_save); - Cvar_RegisterVariable(&r_textureunits); - Cvar_RegisterVariable(&gl_combine); Cvar_RegisterVariable(&r_usedepthtextures); Cvar_RegisterVariable(&r_viewfbo); Cvar_RegisterVariable(&r_rendertarget_debug); @@ -3348,7 +3339,6 @@ void GL_Main_Init(void) Cvar_RegisterVariable(&r_viewscale_fpsscaling_stepsize); Cvar_RegisterVariable(&r_viewscale_fpsscaling_stepmax); Cvar_RegisterVariable(&r_viewscale_fpsscaling_target); - Cvar_RegisterVariable(&r_glsl); Cvar_RegisterVariable(&r_glsl_deluxemapping); Cvar_RegisterVariable(&r_glsl_offsetmapping); Cvar_RegisterVariable(&r_glsl_offsetmapping_steps); diff --git a/render.h b/render.h index bb9b2426..c0ff8cf9 100644 --- a/render.h +++ b/render.h @@ -554,8 +554,6 @@ extern cvar_t r_render; extern cvar_t r_renderview; extern cvar_t r_waterwarp; -extern cvar_t r_textureunits; - extern cvar_t r_glsl_offsetmapping; extern cvar_t r_glsl_offsetmapping_reliefmapping; extern cvar_t r_glsl_offsetmapping_scale; diff --git a/vid.h b/vid.h index 5981d976..5a22072f 100644 --- a/vid.h +++ b/vid.h @@ -183,7 +183,6 @@ extern cvar_t gl_info_vendor; extern cvar_t gl_info_renderer; extern cvar_t gl_info_version; extern cvar_t gl_info_extensions; -extern cvar_t gl_info_platform; extern cvar_t gl_info_driver; // brand of graphics chip diff --git a/vid_sdl.c b/vid_sdl.c index 8a7a326a..12e45f8a 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -1625,7 +1625,6 @@ static qbool VID_InitModeGL(viddef_mode_t *mode) Cvar_SetQuick(&gl_info_vendor, gl_vendor); Cvar_SetQuick(&gl_info_renderer, gl_renderer); Cvar_SetQuick(&gl_info_version, gl_version); - Cvar_SetQuick(&gl_info_platform, "SDL"); Cvar_SetQuick(&gl_info_driver, drivername ? drivername : ""); return true; diff --git a/vid_shared.c b/vid_shared.c index 1a418dd2..2532d8e4 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -129,7 +129,6 @@ cvar_t gl_info_vendor = {CF_CLIENT | CF_READONLY, "gl_info_vendor", "", "indicat cvar_t gl_info_renderer = {CF_CLIENT | CF_READONLY, "gl_info_renderer", "", "indicates graphics chip model and other information"}; cvar_t gl_info_version = {CF_CLIENT | CF_READONLY, "gl_info_version", "", "indicates version of current renderer. begins with 1.0.0, 1.1.0, 1.2.0, 1.3.1 etc."}; cvar_t gl_info_extensions = {CF_CLIENT | CF_READONLY, "gl_info_extensions", "", "indicates extension list found by engine, space separated."}; -cvar_t gl_info_platform = {CF_CLIENT | CF_READONLY, "gl_info_platform", "", "indicates GL platform: SDL, SDL, or SDL."}; cvar_t gl_info_driver = {CF_CLIENT | CF_READONLY, "gl_info_driver", "", "name of driver library (opengl32.dll, libGL.so.1, or whatever)."}; cvar_t vid_fullscreen = {CF_CLIENT | CF_ARCHIVE, "vid_fullscreen", "1", "use fullscreen (1) or windowed (0)"}; @@ -1275,7 +1274,6 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&gl_info_renderer); Cvar_RegisterVariable(&gl_info_version); Cvar_RegisterVariable(&gl_info_extensions); - Cvar_RegisterVariable(&gl_info_platform); Cvar_RegisterVariable(&gl_info_driver); Cvar_RegisterVariable(&v_gamma); Cvar_RegisterVariable(&v_brightness); -- 2.39.2