ref: gl: move forcing gl_vbo to 0 after checking GL extensions out from R_GenerateVBO
This commit is contained in:
parent
0870536405
commit
5c2ab150b3
2 changed files with 5 additions and 10 deletions
|
@ -742,10 +742,8 @@ static void R_RenderInfo_f( void )
|
|||
gEngfuncs.Con_Printf( "GL4ES_VERSION: %s\n", version );
|
||||
if( extensions )
|
||||
gEngfuncs.Con_Reportf( "GL4ES_EXTENSIONS: %s\n", extensions );
|
||||
|
||||
}
|
||||
|
||||
|
||||
gEngfuncs.Con_Printf( "GL_MAX_TEXTURE_SIZE: %i\n", glConfig.max_2d_texture_size );
|
||||
|
||||
if( GL_Support( GL_ARB_MULTITEXTURE ))
|
||||
|
@ -1150,6 +1148,10 @@ void GL_InitExtensions( void )
|
|||
gEngfuncs.Cvar_SetValue( "gl_finish", 1 );
|
||||
#endif
|
||||
|
||||
// we do not want to write vbo code that does not use multitexture
|
||||
if( !GL_Support( GL_ARB_VERTEX_BUFFER_OBJECT_EXT ) || !GL_Support( GL_ARB_MULTITEXTURE ) || glConfig.max_texture_units < 2 )
|
||||
gEngfuncs.Cvar_FullSet( "gl_vbo", "0", FCVAR_READ_ONLY );
|
||||
|
||||
R_RenderInfo_f();
|
||||
|
||||
tr.framecount = tr.visframecount = 1;
|
||||
|
|
|
@ -1859,13 +1859,6 @@ void R_GenerateVBO( void )
|
|||
|
||||
R_ClearVBO();
|
||||
|
||||
// we do not want to write vbo code that does not use multitexture
|
||||
if( !GL_Support( GL_ARB_VERTEX_BUFFER_OBJECT_EXT ) || !GL_Support( GL_ARB_MULTITEXTURE ) || glConfig.max_texture_units < 2 )
|
||||
{
|
||||
gEngfuncs.Cvar_FullSet( "gl_vbo", "0", FCVAR_READ_ONLY );
|
||||
return;
|
||||
}
|
||||
|
||||
t1 = gEngfuncs.pfnTime();
|
||||
|
||||
// save in config if enabled manually
|
||||
|
|
Loading…
Add table
Reference in a new issue