From f125fcf4cc3d24f84b694eb10d59afbe1a9a151c Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 8 Dec 2009 23:17:17 +0000 Subject: [PATCH] some cleanup git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9574 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_screen.c | 1 - gl_rmain.c | 7 +++++++ render.h | 2 ++ vid.h | 1 - vid_shared.c | 6 ------ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index 0590e760..687b2abc 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -61,7 +61,6 @@ cvar_t shownetgraph = {CVAR_SAVE, "shownetgraph", "0", "shows a graph of packet cvar_t cl_demo_mousegrab = {0, "cl_demo_mousegrab", "0", "Allows reading the mouse input while playing demos. Useful for camera mods developed in csqc. (0: never, 1: always)"}; cvar_t timedemo_screenshotframelist = {0, "timedemo_screenshotframelist", "", "when performing a timedemo, take screenshots of each frame in this space-separated list - example: 1 201 401"}; -extern cvar_t r_glsl; extern cvar_t v_glslgamma; extern cvar_t sbar_info_pos; #define WANT_SCREENSHOT_HWGAMMA (scr_screenshot_hwgamma.integer && vid_usinghwgamma) diff --git a/gl_rmain.c b/gl_rmain.c index 17128079..df28719c 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -107,6 +107,10 @@ cvar_t gl_fogstart = {0, "gl_fogstart", "0", "nehahra fog start distance (for Ne cvar_t gl_fogend = {0, "gl_fogend","0", "nehahra fog end distance (for Nehahra compatibility only)"}; cvar_t gl_skyclip = {0, "gl_skyclip", "4608", "nehahra farclip distance - the real fog end (for Nehahra compatibility only)"}; +cvar_t r_textureunits = {0, "r_textureunits", "32", "number of texture units to use in GL 1.1 and GL 1.3 rendering paths"}; +cvar_t gl_combine = {0, "gl_combine", "1", "enables the OpenGL 1.3 rendering path"}; +cvar_t r_glsl = {CVAR_SAVE, "r_glsl", "1", "enables the OpenGL 2.0 rendering path"}; + cvar_t r_glsl_deluxemapping = {CVAR_SAVE, "r_glsl_deluxemapping", "1", "use per pixel lighting on deluxemap-compiled q3bsp maps (or a value of 2 forces deluxemap shading even without deluxemaps)"}; cvar_t r_glsl_offsetmapping = {CVAR_SAVE, "r_glsl_offsetmapping", "0", "offset mapping effect (also known as parallax mapping or virtual displacement mapping)"}; cvar_t r_glsl_offsetmapping_reliefmapping = {CVAR_SAVE, "r_glsl_offsetmapping_reliefmapping", "0", "relief mapping effect (higher quality)"}; @@ -3118,6 +3122,9 @@ void GL_Main_Init(void) Cvar_RegisterVariable(&r_polygonoffset_decals_offset); Cvar_RegisterVariable(&r_fog_exp2); Cvar_RegisterVariable(&r_drawfog); + Cvar_RegisterVariable(&r_textureunits); + Cvar_RegisterVariable(&gl_combine); + Cvar_RegisterVariable(&r_glsl); Cvar_RegisterVariable(&r_glsl_deluxemapping); Cvar_RegisterVariable(&r_glsl_offsetmapping); Cvar_RegisterVariable(&r_glsl_offsetmapping_reliefmapping); diff --git a/render.h b/render.h index f5a77f8b..2bbcc6a5 100644 --- a/render.h +++ b/render.h @@ -167,7 +167,9 @@ extern cvar_t r_renderview; extern cvar_t r_waterwarp; extern cvar_t r_textureunits; +extern cvar_t gl_combine; extern cvar_t r_glsl; + 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 f0b8146f..e3b6018c 100644 --- a/vid.h +++ b/vid.h @@ -140,7 +140,6 @@ extern cvar_t vid_resizable; extern cvar_t vid_minwidth; extern cvar_t vid_minheight; -extern cvar_t gl_combine; extern cvar_t gl_finish; extern cvar_t v_gamma; diff --git a/vid_shared.c b/vid_shared.c index 41b71a68..8a95e1ae 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -54,9 +54,6 @@ cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1", "whether to use the mouse in wi cvar_t vid_grabkeyboard = {CVAR_SAVE, "vid_grabkeyboard", "0", "whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)"}; cvar_t vid_minwidth = {0, "vid_minwidth", "0", "minimum vid_width that is acceptable (to be set in default.cfg in mods)"}; cvar_t vid_minheight = {0, "vid_minheight", "0", "minimum vid_height that is acceptable (to be set in default.cfg in mods)"}; -cvar_t r_textureunits = {0, "r_textureunits", "32", "number of texture units to use in GL 1.1 and GL 1.3 rendering paths"}; -cvar_t gl_combine = {0, "gl_combine", "1", "enables the OpenGL 1.3 rendering path"}; -cvar_t r_glsl = {CVAR_SAVE, "r_glsl", "1", "enables the OpenGL 2.0 rendering path"}; cvar_t vid_gl13 = {0, "vid_gl13", "1", "enables faster rendering using OpenGL 1.3 features (such as GL_ARB_texture_env_combine extension)"}; cvar_t vid_gl20 = {0, "vid_gl20", "1", "enables faster rendering using OpenGL 2.0 features (such as GL_ARB_fragment_shader extension)"}; cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each rendered frame (can help with strange input or video lag problems on some machines)"}; @@ -1174,9 +1171,6 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&vid_resizable); Cvar_RegisterVariable(&vid_minwidth); Cvar_RegisterVariable(&vid_minheight); - Cvar_RegisterVariable(&r_textureunits); - Cvar_RegisterVariable(&gl_combine); - Cvar_RegisterVariable(&r_glsl); Cvar_RegisterVariable(&vid_gl13); Cvar_RegisterVariable(&vid_gl20); Cvar_RegisterVariable(&gl_finish); -- 2.39.2