Rename gl_texture*mode to gl1_texture*mode.
This commit is contained in:
parent
b87465886e
commit
24b014715f
|
@ -216,8 +216,8 @@ extern cvar_t *gl_drawbuffer;
|
||||||
extern cvar_t *r_vsync;
|
extern cvar_t *r_vsync;
|
||||||
extern cvar_t *gl_anisotropic;
|
extern cvar_t *gl_anisotropic;
|
||||||
extern cvar_t *gl_texturemode;
|
extern cvar_t *gl_texturemode;
|
||||||
extern cvar_t *gl_texturealphamode;
|
extern cvar_t *gl1_texturealphamode;
|
||||||
extern cvar_t *gl_texturesolidmode;
|
extern cvar_t *gl1_texturesolidmode;
|
||||||
extern cvar_t *gl1_saturatelighting;
|
extern cvar_t *gl1_saturatelighting;
|
||||||
extern cvar_t *r_lockpvs;
|
extern cvar_t *r_lockpvs;
|
||||||
extern cvar_t *gl_msaa_samples;
|
extern cvar_t *gl_msaa_samples;
|
||||||
|
|
|
@ -122,8 +122,8 @@ cvar_t *gl1_flashblend;
|
||||||
cvar_t *gl1_saturatelighting;
|
cvar_t *gl1_saturatelighting;
|
||||||
cvar_t *r_vsync;
|
cvar_t *r_vsync;
|
||||||
cvar_t *gl_texturemode;
|
cvar_t *gl_texturemode;
|
||||||
cvar_t *gl_texturealphamode;
|
cvar_t *gl1_texturealphamode;
|
||||||
cvar_t *gl_texturesolidmode;
|
cvar_t *gl1_texturesolidmode;
|
||||||
cvar_t *gl_anisotropic;
|
cvar_t *gl_anisotropic;
|
||||||
cvar_t *r_lockpvs;
|
cvar_t *r_lockpvs;
|
||||||
cvar_t *gl_msaa_samples;
|
cvar_t *gl_msaa_samples;
|
||||||
|
@ -1238,8 +1238,8 @@ R_Register(void)
|
||||||
gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
|
gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
|
||||||
|
|
||||||
gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
|
gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
|
||||||
gl_texturealphamode = ri.Cvar_Get("gl_texturealphamode", "default", CVAR_ARCHIVE);
|
gl1_texturealphamode = ri.Cvar_Get("gl1_texturealphamode", "default", CVAR_ARCHIVE);
|
||||||
gl_texturesolidmode = ri.Cvar_Get("gl_texturesolidmode", "default", CVAR_ARCHIVE);
|
gl1_texturesolidmode = ri.Cvar_Get("gl1_texturesolidmode", "default", CVAR_ARCHIVE);
|
||||||
gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
|
gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
|
||||||
r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
|
r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
|
||||||
|
|
||||||
|
@ -1707,16 +1707,16 @@ RI_BeginFrame(float camera_separation)
|
||||||
gl_anisotropic->modified = false;
|
gl_anisotropic->modified = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gl_texturealphamode->modified)
|
if (gl1_texturealphamode->modified)
|
||||||
{
|
{
|
||||||
R_TextureAlphaMode(gl_texturealphamode->string);
|
R_TextureAlphaMode(gl1_texturealphamode->string);
|
||||||
gl_texturealphamode->modified = false;
|
gl1_texturealphamode->modified = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gl_texturesolidmode->modified)
|
if (gl1_texturesolidmode->modified)
|
||||||
{
|
{
|
||||||
R_TextureSolidMode(gl_texturesolidmode->string);
|
R_TextureSolidMode(gl1_texturesolidmode->string);
|
||||||
gl_texturesolidmode->modified = false;
|
gl1_texturesolidmode->modified = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r_vsync->modified)
|
if (r_vsync->modified)
|
||||||
|
|
|
@ -168,8 +168,8 @@ R_SetDefaultState(void)
|
||||||
glShadeModel(GL_FLAT);
|
glShadeModel(GL_FLAT);
|
||||||
|
|
||||||
R_TextureMode(gl_texturemode->string);
|
R_TextureMode(gl_texturemode->string);
|
||||||
R_TextureAlphaMode(gl_texturealphamode->string);
|
R_TextureAlphaMode(gl1_texturealphamode->string);
|
||||||
R_TextureSolidMode(gl_texturesolidmode->string);
|
R_TextureSolidMode(gl1_texturesolidmode->string);
|
||||||
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
|
||||||
|
|
|
@ -275,8 +275,8 @@ GL3_Register(void)
|
||||||
//gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
|
//gl1_flashblend = ri.Cvar_Get("gl1_flashblend", "0", 0);
|
||||||
|
|
||||||
//gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
|
//gl_texturemode = ri.Cvar_Get("gl_texturemode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE);
|
||||||
gl_texturealphamode = ri.Cvar_Get("gl_texturealphamode", "default", CVAR_ARCHIVE);
|
gl1_texturealphamode = ri.Cvar_Get("gl1_texturealphamode", "default", CVAR_ARCHIVE);
|
||||||
gl_texturesolidmode = ri.Cvar_Get("gl_texturesolidmode", "default", CVAR_ARCHIVE);
|
gl1_texturesolidmode = ri.Cvar_Get("gl1_texturesolidmode", "default", CVAR_ARCHIVE);
|
||||||
//gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
|
//gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
|
||||||
//r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
|
//r_lockpvs = ri.Cvar_Get("r_lockpvs", "0", 0);
|
||||||
|
|
||||||
|
|
|
@ -43,10 +43,10 @@ GL3_SetDefaultState(void)
|
||||||
|
|
||||||
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
||||||
|
|
||||||
// TODO: gl_texturemode, gl_texturealphamode?
|
// TODO: gl_texturemode, gl1_texturealphamode?
|
||||||
//GL3_TextureMode(gl_texturemode->string);
|
//GL3_TextureMode(gl_texturemode->string);
|
||||||
//R_TextureAlphaMode(gl_texturealphamode->string);
|
//R_TextureAlphaMode(gl1_texturealphamode->string);
|
||||||
//R_TextureSolidMode(gl_texturesolidmode->string);
|
//R_TextureSolidMode(gl1_texturesolidmode->string);
|
||||||
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
|
||||||
|
|
|
@ -77,7 +77,9 @@ replacement_t replacements[] = {
|
||||||
{"gl_stereo_separation", "gl1_stereo_separation"},
|
{"gl_stereo_separation", "gl1_stereo_separation"},
|
||||||
{"gl_stereo_anaglyph_colors", "gl1_stereo_anaglyph_colors"},
|
{"gl_stereo_anaglyph_colors", "gl1_stereo_anaglyph_colors"},
|
||||||
{"gl_stereo_convergence", "gl1_stereo_convergence"},
|
{"gl_stereo_convergence", "gl1_stereo_convergence"},
|
||||||
{"gl_swapinterval", "r_vsync"}
|
{"gl_swapinterval", "r_vsync"},
|
||||||
|
{"gl_texturealphamode", "gl1_texturealphamode"},
|
||||||
|
{"gl_texturesolidmode", "gl1_texturesolidmode"}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue