ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GL Display lists were used regardless of display list settings in points.cpp, this crashes with some Intel videodrivers

This commit is contained in:
pelya 2015-07-23 22:03:52 +03:00
parent d9d76af697
commit ece18581d1
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
radiant/points.cpp
View File

@ -65,8 +65,6 @@ void CPointfile::GenerateDisplayList(){
qglLineWidth( 1 );
qglEndList();
s_check_point = 0;
}
// old (but still relevant) pointfile code -------------------------------------
@ -179,14 +177,35 @@ void WINAPI Pointfile_Check( void ){
g_free( text );
if ( g_PrefsDlg.m_bDisplayLists ) {
g_pointfile.GenerateDisplayList();
}
s_check_point = 0;
Sys_UpdateWindows( W_ALL );
}
void Pointfile_Draw( void ){
if ( g_PrefsDlg.m_bDisplayLists ) {
int i;
qglColor3f( 1, 0, 0 );
qglDisable( GL_TEXTURE_2D );
qglDisable( GL_TEXTURE_1D );
qglLineWidth( 4 );
qglBegin( GL_LINE_STRIP );
for ( i = 0; i < s_num_points; i++ )
{
if ( s_num_points < MAX_POINTFILE ) {
qglVertex3fv( s_pointvecs[i] );
}
}
qglEnd();
qglLineWidth( 1 );
} else {
qglCallList( g_qeglobals.d_pointfile_display_list );
}
}
void Pointfile_Clear( void ){
if ( !g_qeglobals.d_pointfile_display_list ) {
@ -212,7 +231,10 @@ void CPointfile::saxStartElement( message_info_t *ctx, const xmlChar *name, cons
void CPointfile::saxEndElement( message_info_t *ctx, const xmlChar *name ){
if ( strcmp( (char *)name, "polyline" ) == 0 ) {
// we are done
if ( g_PrefsDlg.m_bDisplayLists ) {
GenerateDisplayList();
}
s_check_point = 0;
ctx->bGeometry = false;
}
}