yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

-DBROKEN_GL durch ein CVar ersetzt

Browse source
This commit is contained in:
Yamagi Burmeister 2010-05-22 06:58:09 +00:00
parent 289160c482
commit 95586850e4
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -53,9 +53,6 @@ CFLAGS_BASE = -O2 -fomit-frame-pointer -fno-strict-aliasing \
-fstack-protector-all -Wall -pipe -g -fstack-protector-all -Wall -pipe -g
endif endif
# Uncomment this if your Mesa3D is broken
CFLAGS_BASE += -DBROKEN_MESA
# OGG/Vorbis # OGG/Vorbis
OGGCFLAGS = -I/usr/include -I/usr/local/include OGGCFLAGS = -I/usr/include -I/usr/local/include

27
src/refresh/gl_rmain.c
View file

@ -110,6 +110,8 @@ cvar_t *gl_mode;
cvar_t *gl_customwidth; cvar_t *gl_customwidth;
cvar_t *gl_customheight; cvar_t *gl_customheight;
cvar_t *gl_ext_pointparameters_broken;
cvar_t *gl_dynamic; cvar_t *gl_dynamic;
cvar_t *gl_monolightmap; cvar_t *gl_monolightmap;
cvar_t *gl_modulate; cvar_t *gl_modulate;
@ -966,6 +968,8 @@ void R_Register( void )
gl_customwidth = ri.Cvar_Get ("gl_customwidth", "1024", CVAR_ARCHIVE); gl_customwidth = ri.Cvar_Get ("gl_customwidth", "1024", CVAR_ARCHIVE);
gl_customheight = ri.Cvar_Get ("gl_customheight", "768", CVAR_ARCHIVE); gl_customheight = ri.Cvar_Get ("gl_customheight", "768", CVAR_ARCHIVE);
gl_ext_pointparameters_broken = ri.Cvar_Get ("gl_ext_pointparameters_broken", "0", CVAR_ARCHIVE);
ri.Cmd_AddCommand( "imagelist", GL_ImageList_f ); ri.Cmd_AddCommand( "imagelist", GL_ImageList_f );
ri.Cmd_AddCommand( "screenshot", GL_ScreenShot_f ); ri.Cmd_AddCommand( "screenshot", GL_ScreenShot_f );
ri.Cmd_AddCommand( "modellist", Mod_Modellist_f ); ri.Cmd_AddCommand( "modellist", Mod_Modellist_f );
@ -1183,25 +1187,30 @@ int R_Init( void *hinstance, void *hWnd )
ri.Con_Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" ); ri.Con_Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" );
} }
#ifndef BROKEN_MESA if ( gl_ext_pointparameters_broken->value != 1 )
if ( strstr( gl_config.extensions_string, "GL_EXT_point_parameters" ) )
{ {
if ( gl_ext_pointparameters->value ) if ( strstr( gl_config.extensions_string, "GL_EXT_point_parameters" ) )
{ {
qglPointParameterfEXT = ( void (APIENTRY *)( GLenum, GLfloat ) ) qwglGetProcAddress( "glPointParameterfEXT" ); if ( gl_ext_pointparameters->value )
qglPointParameterfvEXT = ( void (APIENTRY *)( GLenum, const GLfloat * ) ) qwglGetProcAddress( "glPointParameterfvEXT" ); {
ri.Con_Printf( PRINT_ALL, "...using GL_EXT_point_parameters\n" ); qglPointParameterfEXT = ( void (APIENTRY *)( GLenum, GLfloat ) ) qwglGetProcAddress( "glPointParameterfEXT" );
qglPointParameterfvEXT = ( void (APIENTRY *)( GLenum, const GLfloat * ) ) qwglGetProcAddress( "glPointParameterfvEXT" );
ri.Con_Printf( PRINT_ALL, "...using GL_EXT_point_parameters\n" );
}
else
{
ri.Con_Printf( PRINT_ALL, "...ignoring GL_EXT_point_parameters\n" );
}
} }
else else
{ {
ri.Con_Printf( PRINT_ALL, "...ignoring GL_EXT_point_parameters\n" ); ri.Con_Printf( PRINT_ALL, "...GL_EXT_point_parameters not found\n" );
} }
} }
else else
{ {
ri.Con_Printf( PRINT_ALL, "...GL_EXT_point_parameters not found\n" ); ri.Con_Printf( PRINT_ALL, "GL_EXT_point_parameters disabled\n" );
} }
#endif
GL_SetDefaultState(); GL_SetDefaultState();