id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-12-02 08:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into glew and fixed a crash on Intel HD drivers

Browse source
This commit is contained in:
Robert Beckebans 2013-04-23 00:43:00 +02:00
parent aefa4ac6e3
commit fe22638fdd
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/CMakeLists.txt
View file

@ -1158,7 +1158,7 @@ if(MSVC)
list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
set(RBDOOM3_PRECOMPILED_SOURCES ${RBDOOM3_SOURCES})
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES})
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${TIMIDITY_SOURCES} ${JPEG_SOURCES} ${ZLIB_SOURCES} ${GLEW_SOURCES})
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libs/zlib/minizip/ioapi.c)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTDecoder.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/DXT/DXTEncoder.cpp)

2
neo/renderer/RenderSystem_init.cpp
View file

@ -386,7 +386,7 @@ static void R_CheckPortableExtensions()
glConfig.occlusionQueryAvailable = GLEW_ARB_occlusion_query != 0;
// GL_ARB_timer_query
glConfig.timerQueryAvailable = GLEW_ARB_timer_query != 0 || GLEW_EXT_timer_query != 0;
glConfig.timerQueryAvailable = ( GLEW_ARB_timer_query != 0 || GLEW_EXT_timer_query != 0 ) && ( glConfig.vendor != VENDOR_INTEL || r_skipIntelWorkarounds.GetBool() );
// GL_ARB_debug_output
glConfig.debugOutputAvailable = GLEW_ARB_debug_output != 0;

4
neo/sys/win32/win_glimp.cpp
View file

@ -1346,6 +1346,7 @@ bool GLimp_Init( glimpParms_t parms )
}
// RB begin
/*
GLenum glewResult = glewInit();
if( GLEW_OK != glewResult )
{
@ -1356,10 +1357,11 @@ bool GLimp_Init( glimpParms_t parms )
{
common->Printf( "Using GLEW %s\n", glewGetString( GLEW_VERSION ) );
}
*/
// RB end
// wglSwapinterval, etc
GLW_CheckWGLExtensions( win32.hDC );
//GLW_CheckWGLExtensions( win32.hDC );
return true;
}