From 5aa7fb39c266dafc03d52d56aec91b29b1b5640d Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 2 Jul 2017 16:47:55 -0500 Subject: [PATCH] OpenGL2: Remove two unused cvars and update readme --- code/renderergl2/tr_init.c | 5 ----- code/renderergl2/tr_local.h | 3 --- opengl2-readme.md | 21 ++------------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c index 3f364960..2e635593 100644 --- a/code/renderergl2/tr_init.c +++ b/code/renderergl2/tr_init.c @@ -105,9 +105,6 @@ cvar_t *r_arb_seamless_cube_map; cvar_t *r_arb_vertex_array_object; cvar_t *r_ext_direct_state_access; -cvar_t *r_mergeMultidraws; -cvar_t *r_mergeLeafSurfaces; - cvar_t *r_cameraExposure; cvar_t *r_externalGLSL; @@ -1293,8 +1290,6 @@ void R_Register( void ) r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT ); r_anaglyphMode = ri.Cvar_Get("r_anaglyphMode", "0", CVAR_ARCHIVE); - r_mergeMultidraws = ri.Cvar_Get("r_mergeMultidraws", "1", CVAR_ARCHIVE); - r_mergeLeafSurfaces = ri.Cvar_Get("r_mergeLeafSurfaces", "1", CVAR_ARCHIVE); // // temporary variables that can change at any time diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h index 7e8e4b77..1fc91f70 100644 --- a/code/renderergl2/tr_local.h +++ b/code/renderergl2/tr_local.h @@ -1708,9 +1708,6 @@ extern cvar_t *r_skipBackEnd; extern cvar_t *r_anaglyphMode; -extern cvar_t *r_mergeMultidraws; -extern cvar_t *r_mergeLeafSurfaces; - extern cvar_t *r_externalGLSL; extern cvar_t *r_hdr; diff --git a/opengl2-readme.md b/opengl2-readme.md index 857a4600..1b1db203 100644 --- a/opengl2-readme.md +++ b/opengl2-readme.md @@ -136,7 +136,7 @@ Cvars for HDR and tonemapping: r_hdr, r_postprocess, and r_toneMap. 0 - No. 1 - Yes. (default) - + * `r_forceAutoExposure` - Cheat. Override built-in and map auto exposure settings and use cvars r_forceAutoExposureMin and @@ -252,7 +252,7 @@ Cvars for image interpolation and generation: FCBI without second derivatives) 2 - Okay but slow (normal FCBI) -* `r_genNormalMaps* - Naively generate normal maps for all +* `r_genNormalMaps` - Naively generate normal maps for all textures. 0 - Don't. (default) 1 - Do. @@ -302,23 +302,6 @@ Cvars for the sunlight and cascaded shadow maps: Cvars that you probably don't care about or shouldn't mess with: -* `r_mergeMultidraws` - Optimize number of calls to - glMultiDrawElements(). - 0 - Don't. - 1 - Do some. (default) - 2 - Do more than necessary (eats CPU). - -* `r_mergeLeafSurfaces` - Merge surfaces that share common materials - and a common leaf. Speeds up rendering. - 0 - Don't. - 1 - Do. (default) - -* `r_recalcMD3Normals` - Recalculate the normals when loading an MD3. - Fixes normal maps in some cases but looks - ugly in others. - 0 - Don't. (default) - 1 - Do. - * `r_depthPrepass` - Do a depth-only pass before rendering. Speeds up rendering in cases where advanced features are used. Required for