Refresher cleanup.

This commit is contained in:
svdijk 2012-11-05 20:12:43 +01:00 committed by Yamagi Burmeister
parent bdcc08d7fd
commit 8c8fba7421
4 changed files with 23 additions and 25 deletions

View file

@ -3680,17 +3680,17 @@ QGL_Init(const char *dllname)
else else
{ {
ri.Cvar_Set("gl_driver", LIBGL); ri.Cvar_Set("gl_driver", LIBGL);
Com_Printf("Using %s for OpenGL.\n", LIBGL); ri.Con_Printf(PRINT_ALL, "Using %s for OpenGL.\n", LIBGL);
} }
} }
else else
{ {
Com_Printf("Using %s for OpenGL.\n", fn); ri.Con_Printf(PRINT_ALL, "Using %s for OpenGL.\n", fn);
} }
} }
else else
{ {
Com_Printf("Using %s for OpenGL.\n", dllname); ri.Con_Printf(PRINT_ALL, "Using %s for OpenGL.\n", dllname);
} }
qglAccum = dllAccum = ri.Sys_GetProcAddress(glw_state.OpenGLLib, "glAccum"); qglAccum = dllAccum = ri.Sys_GetProcAddress(glw_state.OpenGLLib, "glAccum");

View file

@ -629,7 +629,7 @@ IN_BackendInit(in_state_t *in_state_p)
CVAR_USERINFO | CVAR_ARCHIVE); CVAR_USERINFO | CVAR_ARCHIVE);
in_grab = ri.Cvar_Get("in_grab", "2", CVAR_ARCHIVE); in_grab = ri.Cvar_Get("in_grab", "2", CVAR_ARCHIVE);
Com_Printf("Input initialized.\n"); ri.Con_Printf(PRINT_ALL, "Input initialized.\n");
} }
/* /*
@ -641,7 +641,7 @@ IN_BackendShutdown(void)
ri.Cmd_RemoveCommand("+mlook"); ri.Cmd_RemoveCommand("+mlook");
ri.Cmd_RemoveCommand("-mlook"); ri.Cmd_RemoveCommand("-mlook");
ri.Cmd_RemoveCommand("force_centerview"); ri.Cmd_RemoveCommand("force_centerview");
Com_Printf("Input shut down.\n"); ri.Con_Printf(PRINT_ALL, "Input shut down.\n");
} }
/* /*

View file

@ -241,7 +241,7 @@ GLimp_InitGraphics(qboolean fullscreen)
{ {
if (counter == 1) if (counter == 1)
{ {
Sys_Error(PRINT_ALL, "Failed to revert to gl_mode 4. Exiting...\n"); ri.Sys_Error(ERR_FATAL, "Failed to revert to gl_mode 4. Exiting...\n");
return false; return false;
} }

View file

@ -1112,16 +1112,16 @@ R_Init(void *hinstance, void *hWnd)
} }
/* Options */ /* Options */
Com_Printf("Refresher build options:\n"); ri.Con_Printf(PRINT_ALL, "Refresher build options:\n");
#ifdef RETEXTURE #ifdef RETEXTURE
Com_Printf(" + Retexturing support\n"); ri.Con_Printf(PRINT_ALL, " + Retexturing support\n");
#else #else
Com_Printf(" - Retexturing support\n"); ri.Con_Printf(PRINT_ALL, " - Retexturing support\n");
#endif #endif
#ifdef X11GAMMA #ifdef X11GAMMA
Com_Printf(" + Gamma via X11\n"); ri.Con_Printf(PRINT_ALL, " + Gamma via X11\n");
#else #else
Com_Printf(" - Gamma via X11\n"); ri.Con_Printf(PRINT_ALL, " - Gamma via X11\n");
#endif #endif
ri.Con_Printf(PRINT_ALL, "Refresh: " REF_VERSION "\n"); ri.Con_Printf(PRINT_ALL, "Refresh: " REF_VERSION "\n");
@ -1187,7 +1187,7 @@ R_Init(void *hinstance, void *hWnd)
if (strstr(gl_config.extensions_string, "GL_EXT_compiled_vertex_array") || if (strstr(gl_config.extensions_string, "GL_EXT_compiled_vertex_array") ||
strstr(gl_config.extensions_string, "GL_SGI_compiled_vertex_array")) strstr(gl_config.extensions_string, "GL_SGI_compiled_vertex_array"))
{ {
ri.Con_Printf(PRINT_ALL, "...enabling GL_EXT_compiled_vertex_array\n"); ri.Con_Printf(PRINT_ALL, "...using GL_EXT_compiled_vertex_array\n");
qglLockArraysEXT = (void *)GetProcAddressGL("glLockArraysEXT"); qglLockArraysEXT = (void *)GetProcAddressGL("glLockArraysEXT");
qglUnlockArraysEXT = (void *)GetProcAddressGL("glUnlockArraysEXT"); qglUnlockArraysEXT = (void *)GetProcAddressGL("glUnlockArraysEXT");
} }
@ -1200,11 +1200,11 @@ R_Init(void *hinstance, void *hWnd)
{ {
if (gl_ext_pointparameters->value) if (gl_ext_pointparameters->value)
{ {
ri.Con_Printf(PRINT_ALL, "...using GL_EXT_point_parameters\n");
qglPointParameterfEXT = (void (APIENTRY *)(GLenum, GLfloat)) qglPointParameterfEXT = (void (APIENTRY *)(GLenum, GLfloat))
GetProcAddressGL("glPointParameterfEXT"); GetProcAddressGL("glPointParameterfEXT");
qglPointParameterfvEXT = (void (APIENTRY *)(GLenum, const GLfloat *)) qglPointParameterfvEXT = (void (APIENTRY *)(GLenum, const GLfloat *))
GetProcAddressGL("glPointParameterfvEXT"); GetProcAddressGL("glPointParameterfvEXT");
ri.Con_Printf(PRINT_ALL, "...using GL_EXT_point_parameters\n");
} }
else else
{ {
@ -1230,8 +1230,7 @@ R_Init(void *hinstance, void *hWnd)
} }
else else
{ {
ri.Con_Printf(PRINT_ALL, ri.Con_Printf(PRINT_ALL, "...ignoring GL_EXT_shared_texture_palette\n");
"...ignoring GL_EXT_shared_texture_palette\n");
} }
} }
else else
@ -1264,8 +1263,7 @@ R_Init(void *hinstance, void *hWnd)
{ {
if (qglActiveTextureARB) if (qglActiveTextureARB)
{ {
ri.Con_Printf(PRINT_ALL, ri.Con_Printf(PRINT_ALL, "...GL_SGIS_multitexture deprecated in favor of ARB_multitexture\n");
"...GL_SGIS_multitexture deprecated in favor of ARB_multitexture\n");
} }
else if (gl_ext_multitexture->value) else if (gl_ext_multitexture->value)
{ {
@ -1296,7 +1294,7 @@ R_Init(void *hinstance, void *hWnd)
} }
else else
{ {
ri.Con_Printf(PRINT_ALL, "..GL_EXT_texture_filter_anisotropic not found\n"); ri.Con_Printf(PRINT_ALL, "...GL_EXT_texture_filter_anisotropic not found\n");
gl_config.anisotropic = false; gl_config.anisotropic = false;
gl_config.max_anisotropy = 0.0; gl_config.max_anisotropy = 0.0;
ri.Cvar_SetValue("gl_anisotropic_avail", 0.0); ri.Cvar_SetValue("gl_anisotropic_avail", 0.0);
@ -1308,17 +1306,17 @@ R_Init(void *hinstance, void *hWnd)
{ {
if (gl_ext_mtexcombine->value) if (gl_ext_mtexcombine->value)
{ {
Com_Printf("...using GL_ARB_texture_env_combine\n"); ri.Con_Printf(PRINT_ALL, "...using GL_ARB_texture_env_combine\n");
gl_config.mtexcombine = true; gl_config.mtexcombine = true;
} }
else else
{ {
Com_Printf("...ignoring GL_ARB_texture_env_combine\n"); ri.Con_Printf(PRINT_ALL, "...ignoring GL_ARB_texture_env_combine\n");
} }
} }
else else
{ {
Com_Printf("...GL_ARB_texture_env_combine not found\n"); ri.Con_Printf(PRINT_ALL, "...GL_ARB_texture_env_combine not found\n");
} }
if (!gl_config.mtexcombine) if (!gl_config.mtexcombine)
@ -1327,17 +1325,17 @@ R_Init(void *hinstance, void *hWnd)
{ {
if (gl_ext_mtexcombine->value) if (gl_ext_mtexcombine->value)
{ {
Com_Printf("...using GL_EXT_texture_env_combine\n"); ri.Con_Printf(PRINT_ALL, "...using GL_EXT_texture_env_combine\n");
gl_config.mtexcombine = true; gl_config.mtexcombine = true;
} }
else else
{ {
Com_Printf("...ignoring GL_EXT_texture_env_combine\n"); ri.Con_Printf(PRINT_ALL, "...ignoring GL_EXT_texture_env_combine\n");
} }
} }
else else
{ {
Com_Printf("...GL_EXT_texture_env_combine not found\n"); ri.Con_Printf(PRINT_ALL, "...GL_EXT_texture_env_combine not found\n");
} }
} }
@ -1618,7 +1616,7 @@ R_GetRefAPI(refimport_t rimp)
/* /*
* this is only here so the functions in * this is only here so the functions in
* q_shared.c can link * shared.c, mem.c and hunk.c can link
*/ */
void void
Sys_Error(char *error, ...) Sys_Error(char *error, ...)