yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl_config.mtexcomb should depend on gl_config.multitexture

This commit is contained in:
Yamagi Burmeister 2016-08-06 18:28:02 +02:00
parent dd36eee0f1
commit cd61504af8
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/client/refresh/r_main.c
View File

@ -1529,6 +1529,28 @@ R_Init(void *hinstance, void *hWnd)
// ---- // ----
/* Multi texturing combine */
VID_Printf(PRINT_ALL, " - Multi texturing combine: ");
if (strstr(gl_config.extensions_string, "GL_ARB_texture_env_combine") && gl_config.multitexture)
{
if (gl_mtexcombine->value)
{
gl_config.mtexcombine = true;
VID_Printf(PRINT_ALL, "Okay\n");
}
else
{
VID_Printf(PRINT_ALL, "Disabled\n");
}
}
else
{
VID_Printf(PRINT_ALL, "Failed\n");
}
// --------
/* Anisotropic */ /* Anisotropic */
VID_Printf(PRINT_ALL, " - Anisotropic: "); VID_Printf(PRINT_ALL, " - Anisotropic: ");
@ -1567,28 +1589,6 @@ R_Init(void *hinstance, void *hWnd)
// ---- // ----
/* Multi texturing combine */
VID_Printf(PRINT_ALL, " - Multi texturing combine: ");
if (strstr(gl_config.extensions_string, "GL_ARB_texture_env_combine"))
{
if (gl_mtexcombine->value)
{
gl_config.mtexcombine = true;
VID_Printf(PRINT_ALL, "Okay");
}
else
{
VID_Printf(PRINT_ALL, "Disabled\n");
}
}
else
{
VID_Printf(PRINT_ALL, "Failed\n");
}
// --------
R_SetDefaultState(); R_SetDefaultState();
R_InitImages(); R_InitImages();
@ -1596,13 +1596,6 @@ R_Init(void *hinstance, void *hWnd)
R_InitParticleTexture(); R_InitParticleTexture();
Draw_InitLocal(); Draw_InitLocal();
err = glGetError();
if (err != GL_NO_ERROR)
{
VID_Printf(PRINT_ALL, "glGetError() = 0x%x\n", err);
}
return true; return true;
} }