vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ref: gl: move forcing gl_vbo to 0 after checking GL extensions out from R_GenerateVBO

Browse source
This commit is contained in:
Alibek Omarov 2024-09-05 01:47:14 +03:00
parent 0870536405
commit 5c2ab150b3
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ref/gl/gl_opengl.c
View file

@ -742,10 +742,8 @@ static void R_RenderInfo_f( void )
gEngfuncs.Con_Printf( "GL4ES_VERSION: %s\n", version ); gEngfuncs.Con_Printf( "GL4ES_VERSION: %s\n", version );
if( extensions ) if( extensions )
gEngfuncs.Con_Reportf( "GL4ES_EXTENSIONS: %s\n", extensions ); gEngfuncs.Con_Reportf( "GL4ES_EXTENSIONS: %s\n", extensions );
} }
gEngfuncs.Con_Printf( "GL_MAX_TEXTURE_SIZE: %i\n", glConfig.max_2d_texture_size ); gEngfuncs.Con_Printf( "GL_MAX_TEXTURE_SIZE: %i\n", glConfig.max_2d_texture_size );
if( GL_Support( GL_ARB_MULTITEXTURE )) if( GL_Support( GL_ARB_MULTITEXTURE ))
@ -1150,6 +1148,10 @@ void GL_InitExtensions( void )
gEngfuncs.Cvar_SetValue( "gl_finish", 1 ); gEngfuncs.Cvar_SetValue( "gl_finish", 1 );
#endif #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(); R_RenderInfo_f();
tr.framecount = tr.visframecount = 1; tr.framecount = tr.visframecount = 1;

9
ref/gl/gl_rsurf.c
View file

@ -1859,13 +1859,6 @@ void R_GenerateVBO( void )
R_ClearVBO(); 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(); t1 = gEngfuncs.pfnTime();
// save in config if enabled manually // save in config if enabled manually
@ -3028,7 +3021,7 @@ void R_DrawVBO( qboolean drawlightmap, qboolean drawtextures )
R_SetupVBOArrayStatic( vbo, drawlightmap, drawtextures ); R_SetupVBOArrayStatic( vbo, drawlightmap, drawtextures );
mtst.skiptexture = !drawtextures; mtst.skiptexture = !drawtextures;
mtst.tmu_dt = glConfig.max_texture_units > 2 && r_vbo_detail.value == 2? XASH_TEXTURE2:-1; mtst.tmu_dt = glConfig.max_texture_units > 2 && r_vbo_detail.value == 2 ? XASH_TEXTURE2 : -1;
// setup limits // setup limits
if( vbos.minlightmap > vbos.minarraysplit_lm ) if( vbos.minlightmap > vbos.minarraysplit_lm )