Avoid calling R_SetColorMappings() too early

Simplified window shutdown on win32

code/renderer/tr_image.c

@@ -1354,6 +1354,11 @@ void R_SetColorMappings( void ) {
 	int		shift;
 	qboolean applyGamma;
 
+	if ( !tr.inited ) {
+		// it may be called from window handling functions where gamma flags is now yet known/set
+		return;
+	}
+
 	// setup the overbright lighting
 	// negative value will force gamma in windowed mode
 	tr.overbrightBits = abs( r_overBrightBits->integer );

code/renderer/tr_init.c

@@ -643,6 +643,8 @@ static void InitOpenGL( void )
 
 	// set default state
 	GL_SetDefaultState();
+
+	tr.inited = qtrue;
 }
 
 
@@ -1795,6 +1797,7 @@ static void RE_Shutdown( refShutdownCode_t code ) {
 	ri.FreeAll();
 
 	tr.registered = qfalse;
+	tr.inited = qfalse;
 }
 
 

code/renderer/tr_local.h

@@ -1067,6 +1067,7 @@ typedef struct {
 */
 typedef struct {
 	qboolean				registered;		// cleared at shutdown, set at beginRegistration
+	qboolean				inited;			// cleared at shutdown, set at InitOpenGL
 
 	int						visCount;		// incremented every time a new vis cluster is entered
 	int						frameCount;		// incremented every frame

code/renderervk/tr_image.c

@@ -1681,6 +1681,11 @@ void R_SetColorMappings( void ) {
 	int		shift;
 	qboolean applyGamma;
 
+	if ( !tr.inited ) {
+		// it may be called from window handling functions where gamma flags is now yet known/set
+		return;
+	}
+
 	// setup the overbright lighting
 	// negative value will force gamma in windowed mode
 	tr.overbrightBits = abs( r_overBrightBits->integer );

code/renderervk/tr_init.c

@@ -598,6 +598,8 @@ static void InitOpenGL( void )
 
 	// set default state
 	GL_SetDefaultState();
+
+	tr.inited = qtrue;
 }
 
 
@@ -1869,6 +1871,7 @@ static void RE_Shutdown( refShutdownCode_t code ) {
 	ri.FreeAll();
 
 	tr.registered = qfalse;
+	tr.inited = qfalse;
 }
 
 

code/renderervk/tr_local.h

@@ -1144,6 +1144,7 @@ typedef struct drawSurfsCommand_s drawSurfsCommand_t;
 */
 typedef struct {
 	qboolean				registered;		// cleared at shutdown, set at beginRegistration
+	qboolean				inited;			// cleared at shutdown, set at InitOpenGL
 
 	int						visCount;		// incremented every time a new vis cluster is entered
 	int						frameCount;		// incremented every frame

code/win32/win_glimp.c

@@ -1428,7 +1428,7 @@ void GLimp_Shutdown( qboolean unloadDLL )
 	if ( g_wv.hWnd )
 	{
 		Com_Printf( "...destroying window\n" );
-		ShowWindow( g_wv.hWnd, SW_HIDE );
+		//ShowWindow( g_wv.hWnd, SW_HIDE );
 		DestroyWindow( g_wv.hWnd );
 		g_wv.hWnd = NULL;
 		glw_state.pixelFormatSet = qfalse;
@@ -1535,7 +1535,7 @@ void VKimp_Shutdown( qboolean unloadDLL )
 	if ( g_wv.hWnd )
 	{
 		Com_Printf( "...destroying window\n" );
-		ShowWindow( g_wv.hWnd, SW_HIDE );
+		//ShowWindow( g_wv.hWnd, SW_HIDE );
 		DestroyWindow( g_wv.hWnd );
 		g_wv.hWnd = NULL;
 	}