From e5b321d5e9d098f905e4696720685b8d66beea9f Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Fri, 2 Nov 2001 11:06:35 +0000 Subject: [PATCH] fixed gl_combine so it is enabled by default (if present) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1001 d7cf8633-e32d-0410-b094-e92efae38249 --- vid_shared.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/vid_shared.c b/vid_shared.c index f582b6fc..cda7de63 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -15,7 +15,7 @@ int gl_supportslockarrays = false; cvar_t vid_mode = {0, "vid_mode", "0"}; cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"}; cvar_t vid_fullscreen = {0, "vid_fullscreen", "1"}; -cvar_t gl_combine = {0, "gl_combine", "0"}; +cvar_t gl_combine = {0, "gl_combine", "1"}; // GL_ARB_multitexture void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat); @@ -122,27 +122,6 @@ void VID_CheckExtensions(void) #endif } -/* -void VID_CheckCombine(void) -{ - // LordHavoc: although texture_env_combine doesn't require multiple TMUs - // (it does require the multitexture extension however), it is useless to - // darkplaces without multiple TMUs... - if (gl_mtexable && strstr(gl_extensions, "GL_ARB_texture_env_combine ")) - { - gl_combine_extension = true; - Cvar_SetValue("gl_combine", true); - Con_Printf("GL_ARB_texture_env_combine detected\n"); - } - else - { - gl_combine_extension = false; - Cvar_SetValue("gl_combine", false); - Con_Printf("GL_ARB_texture_env_combine not detected\n"); - } -} -*/ - void Force_CenterView_f (void) { cl.viewangles[PITCH] = 0; -- 2.39.2