FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2025-01-16 21:29:55 +01:00
Code Issues 2 Projects Releases Wiki Activity

ref_gl: init r_temppool before InitExtensions, fix extension string allocation

Browse Source
This commit is contained in:
mittorn 2023-10-13 01:40:33 +03:00 committed by Alibek Omarov
parent d378878c91
commit c7dd9d6437
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ref/gl/gl_opengl.c
View File

@ -982,7 +982,7 @@ void GL_InitExtensions( void )
char *str; char *str;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
len += Q_strlen((const char*)pglGetStringi(GL_EXTENSIONS, i)) + 1; len += Q_strlen((const char*)pglGetStringi(GL_EXTENSIONS, i)) + 1;
str = (char*)Mem_Calloc( 1, len ); str = (char*)Mem_Calloc( r_temppool, len );
glConfig.extensions_string = str; glConfig.extensions_string = str;
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
{ {
@ -1162,6 +1162,8 @@ qboolean R_Init( void )
GL_SetDefaultState(); GL_SetDefaultState();
r_temppool = Mem_AllocPool( "Render Zone" );
// create the window and set up the context // create the window and set up the context
if( !gEngfuncs.R_Init_Video( REF_GL )) // request GL context if( !gEngfuncs.R_Init_Video( REF_GL )) // request GL context
{ {
@ -1169,11 +1171,10 @@ qboolean R_Init( void )
gEngfuncs.R_Free_Video(); gEngfuncs.R_Free_Video();
// Why? Host_Error again??? // Why? Host_Error again???
// gEngfuncs.Host_Error( "Can't initialize video subsystem\nProbably driver was not installed" ); // gEngfuncs.Host_Error( "Can't initialize video subsystem\nProbably driver was not installed" );
Mem_FreePool( &r_temppool );
return false; return false;
} }
r_temppool = Mem_AllocPool( "Render Zone" );
GL_SetDefaults(); GL_SetDefaults();
R_CheckVBO(); R_CheckVBO();
R_InitImages(); R_InitImages();