qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-30 04:30:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

If (!var) checking for a cvar setup. Can't believe that one slipped by for so

Browse source 
long... Also set a few globals static.
This commit is contained in:
Ragnvald Maartmann-Moe IV 2004-02-27 20:40:26 +00:00
parent cdb02edc88
commit 28fda91e8c
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libs/video/targets/vid_common_gl.c
View file

@ -77,7 +77,8 @@ int gl_major;
int gl_minor; int gl_minor;
int gl_release_number; int gl_release_number;
int gl_bgra_capable, use_bgra; static int gl_bgra_capable;
int use_bgra;
int gl_va_capable; int gl_va_capable;
int vaelements; int vaelements;
int texture_extension_number = 1; int texture_extension_number = 1;
@ -86,11 +87,11 @@ int gl_filter_max = GL_LINEAR;
float gldepthmin, gldepthmax; float gldepthmin, gldepthmax;
// Multitexture // Multitexture
qboolean gl_mtex_capable = false; static qboolean gl_mtex_capable = false;
qboolean gl_mtex_fullbright = false; static int gl_mtex_tmus = 0;
int gl_mtex_active_tmus = 0;
GLenum gl_mtex_enum; GLenum gl_mtex_enum;
int gl_mtex_active_tmus = 0;
qboolean gl_mtex_fullbright = false;
// Combine // Combine
qboolean gl_combine_capable = false; qboolean gl_combine_capable = false;
@ -101,8 +102,9 @@ qboolean is8bit = false;
qboolean gl_feature_mach64 = false; qboolean gl_feature_mach64 = false;
// ATI PN_triangles // ATI PN_triangles
qboolean TruForm; static qboolean TruForm;
GLint tess, tess_max; static GLint tess_max;
GLint tess;
cvar_t *gl_doublebright; cvar_t *gl_doublebright;
cvar_t *gl_fb_bmodels; cvar_t *gl_fb_bmodels;
@ -115,21 +117,22 @@ cvar_t *gl_screenshot_byte_swap;
cvar_t *vid_mode; cvar_t *vid_mode;
cvar_t *vid_use8bit; cvar_t *vid_use8bit;
static int gl_mtex_tmus = 0;
static void static void
gl_max_size_f (cvar_t *var) gl_max_size_f (cvar_t *var)
{ {
GLint texSize; GLint texSize;
if (!var)
return;
// Check driver's max texture size // Check driver's max texture size
qfglGetIntegerv (GL_MAX_TEXTURE_SIZE, &texSize); qfglGetIntegerv (GL_MAX_TEXTURE_SIZE, &texSize);
if (var->int_val < 1) {
if (var->int_val < 1)
Cvar_SetValue (var, texSize); Cvar_SetValue (var, texSize);
else } else {
Cvar_SetValue (var, bound (1, var->int_val, texSize)); Cvar_SetValue (var, bound (1, var->int_val, texSize));
}
} }
static void static void
@ -152,11 +155,8 @@ gl_textures_bgra_f (cvar_t *var)
if (!var) if (!var)
return; return;
if (var->int_val) { if (var->int_val && gl_bgra_capable) {
if (gl_bgra_capable) use_bgra = 1;
use_bgra = 1;
else
use_bgra = 0;
} else { } else {
use_bgra = 0; use_bgra = 0;
} }
@ -167,6 +167,7 @@ gl_fb_bmodels_f (cvar_t *var)
{ {
if (!var) if (!var)
return; return;
if (var->int_val && gl_mtex_tmus >= 3) { if (var->int_val && gl_mtex_tmus >= 3) {
gl_mtex_fullbright = true; gl_mtex_fullbright = true;
} else { } else {