yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-03-27 21:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cache gl_nolerp_list Cvar in ref libs, fix possible bug in R_FindImage()

Browse source 
I see no reason to Cvar_Get() gl_nolerp_list again and again, just save
it like all the other gl_ Cvars.
This commit is contained in:
Daniel Gibson 2016-12-30 03:56:27 +01:00
parent 64a456b867
commit 0787b75792
8 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/refresh/gl/header/local.h
View file

@ -194,6 +194,8 @@ extern cvar_t *gl_customheight;
extern cvar_t *gl_retexturing;
extern cvar_t *gl_nolerp_list;
extern cvar_t *gl_lightmap;
extern cvar_t *gl_shadows;
extern cvar_t *gl_stencilshadow;

5
src/client/refresh/gl/r_draw.c
View file

@ -33,14 +33,9 @@ void Scrap_Upload(void);
extern unsigned r_rawpalette[256];
static cvar_t *gl_nolerp_list;
void
Draw_InitLocal(void)
{
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
/* load console characters */
draw_chars = R_FindImage("pics/conchars.pcx", it_pic);
}

12
src/client/refresh/gl/r_image.c
View file

@ -880,10 +880,9 @@ R_LoadPic(char *name, byte *pic, int width, int realwidth,
qboolean nolerp = false;
cvar_t* nolerp_var = ri.Cvar_Get("gl_nolerp_list", NULL, 0); // FIXME: isn't this cached somewhere?!
if(nolerp_var != NULL && nolerp_var->string != NULL)
if(gl_nolerp_list != NULL && gl_nolerp_list->string != NULL)
{
nolerp = strstr(nolerp_var->string, name) != NULL;
nolerp = strstr(gl_nolerp_list->string, name) != NULL;
}
/* find a free image_t */
@ -1219,9 +1218,10 @@ R_FindImage(char *name, imagetype_t type)
* if (realwidth == 0 || realheight == 0) return NULL;
*/
LoadSTB(name, ext, &pic, &width, &height);
image = R_LoadPic(name, pic, width, realwidth,
height, realheight, type, 32);
if(LoadSTB(name, ext, &pic, &width, &height))
{
image = R_LoadPic(name, pic, width, realwidth, height, realheight, type, 32);
}
}
else
{

4
src/client/refresh/gl/r_main.c
View file

@ -103,6 +103,8 @@ cvar_t *gl_customheight;
cvar_t *gl_retexturing;
cvar_t *gl_nolerp_list;
cvar_t *gl_dynamic;
cvar_t *gl_modulate;
cvar_t *gl_nobind;
@ -1254,6 +1256,8 @@ R_Register(void)
gl_retexturing = ri.Cvar_Get("gl_retexturing", "1", CVAR_ARCHIVE);
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
gl_stereo = ri.Cvar_Get( "gl_stereo", "0", CVAR_ARCHIVE );
gl_stereo_separation = ri.Cvar_Get( "gl_stereo_separation", "-0.4", CVAR_ARCHIVE );

5
src/client/refresh/gl3/gl3_draw.c
View file

@ -29,16 +29,11 @@
unsigned d_8to24table[256];
static cvar_t *gl_nolerp_list;
gl3image_t *draw_chars;
void
GL3_Draw_InitLocal(void)
{
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
/* load console characters */
draw_chars = GL3_FindImage("pics/conchars.pcx", it_pic);
}

7
src/client/refresh/gl3/gl3_image.c
View file

@ -319,9 +319,10 @@ GL3_FindImage(char *name, imagetype_t type)
* if (realwidth == 0 || realheight == 0) return NULL;
*/
LoadSTB(name, ext, &pic, &width, &height);
image = R_LoadPic(name, pic, width, realwidth,
height, realheight, type, 32);
if(LoadSTB(name, ext, &pic, &width, &height))
{
image = R_LoadPic(name, pic, width, realwidth, height, realheight, type, 32);
}
}
else
{

8
src/client/refresh/gl3/gl3_main.c
View file

@ -51,6 +51,8 @@ cvar_t *gl_customheight;
cvar_t *vid_gamma;
cvar_t *gl_anisotropic;
cvar_t *gl_nolerp_list;
cvar_t *gl3_debugcontext;
static void
@ -78,10 +80,14 @@ GL3_Register(void)
gl_swapinterval = ri.Cvar_Get("gl_swapinterval", "1", CVAR_ARCHIVE);
gl_msaa_samples = ri.Cvar_Get ( "gl_msaa_samples", "0", CVAR_ARCHIVE );
gl_retexturing = ri.Cvar_Get("gl_retexturing", "1", CVAR_ARCHIVE);
gl3_debugcontext = ri.Cvar_Get("gl3_debugcontext", "0", 0); // TODO: really archive?
gl3_debugcontext = ri.Cvar_Get("gl3_debugcontext", "0", 0);
gl_mode = ri.Cvar_Get("gl_mode", "4", CVAR_ARCHIVE);
gl_customwidth = ri.Cvar_Get("gl_customwidth", "1024", CVAR_ARCHIVE);
gl_customheight = ri.Cvar_Get("gl_customheight", "768", CVAR_ARCHIVE);
/* don't bilerp characters and crosshairs */
gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
vid_fullscreen = ri.Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE);

3
src/client/refresh/gl3/header/local.h
View file

@ -144,6 +144,9 @@ extern cvar_t *vid_fullscreen;
extern cvar_t *gl_mode;
extern cvar_t *gl_customwidth;
extern cvar_t *gl_customheight;
extern cvar_t *gl_nolerp_list;
extern cvar_t *vid_gamma;
extern cvar_t *gl_anisotropic;