From fe22638fdd424da2c378bd5120265cef42c74dc6 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Tue, 23 Apr 2013 00:43:00 +0200
Subject: [PATCH] Merge branch 'master' into glew and fixed a crash on Intel HD
 drivers

---
 neo/CMakeLists.txt                 | 2 +-
 neo/renderer/RenderSystem_init.cpp | 2 +-
 neo/sys/win32/win_glimp.cpp        | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index 22fe2efb..b85a8027 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -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)
diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp
index feb7c72f..32ed1bd9 100644
--- a/neo/renderer/RenderSystem_init.cpp
+++ b/neo/renderer/RenderSystem_init.cpp
@@ -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;
diff --git a/neo/sys/win32/win_glimp.cpp b/neo/sys/win32/win_glimp.cpp
index 2646821c..42d0ffcb 100644
--- a/neo/sys/win32/win_glimp.cpp
+++ b/neo/sys/win32/win_glimp.cpp
@@ -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;
 }