(Almost) NUKE glDriverType_t

Almost because until 0.56 it's still there in the glconfig_t IPC struct.

Also nuke accompanying logspam which provides no new information and
falsely suggests that there are discrete "modes" depending on the OpenGL
version number.

Author: slipher

src/engine/renderer/tr_init.cpp

@@ -968,10 +968,8 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 			Log::Notice("Using OpenGL version %d.%d, requested: %d.%d", glConfig2.glMajor, glConfig2.glMinor, glConfig2.glRequestedMajor, glConfig2.glRequestedMinor );
 		}
 
-		if ( glConfig.driverType == glDriverType_t::GLDRV_OPENGL3 )
+		if ( std::make_pair( glConfig2.glMajor, glConfig2.glMinor ) >= std::make_pair( 3, 2 ) )
 		{
-			Log::Notice("%sUsing OpenGL 3.x context.", Color::ToString( Color::Green ) );
-
 			/* See https://www.khronos.org/opengl/wiki/OpenGL_Context
 			for information about core, compatibility and forward context. */
 
@@ -984,10 +982,6 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 				Log::Notice("%sUsing an OpenGL compatibility profile.", Color::ToString( Color::Red ) );
 			}
 		}
-		else
-		{
-			Log::Notice("%sUsing OpenGL 2.x context.", Color::ToString( Color::Red ) );
-		}
 
 		if ( glConfig2.glForwardCompatibleContext )
 		{

src/engine/renderer/tr_types.h

@@ -251,20 +251,13 @@ enum class textureCompression_t
   TC_EXT_COMP_S3TC
 };
 
-// Keep the list in sdl_glimp.c:reportDriverType in sync with this
+// TODO(0.56): remove.
 enum class glDriverType_t
 {
   GLDRV_UNKNOWN = -1,
-  GLDRV_ICD, // driver is integrated with window system
-  // WARNING: there are tests that check for
-  // > GLDRV_ICD for minidriverness, so this
-  // should always be the lowest value in this
-  // enum set
-  GLDRV_STANDALONE, // driver is a non-3Dfx standalone driver
-
-// XreaL BEGIN
-  GLDRV_OPENGL3, // new driver system
-// XreaL END
+  GLDRV_ICD,
+  GLDRV_STANDALONE,
+  GLDRV_OPENGL3,
 };
 
 // Keep the list in sdl_glimp.c:reportHardwareType in sync with this

src/engine/sys/sdl_glimp.cpp

@@ -46,8 +46,6 @@ static Cvar::Modified<Cvar::Cvar<bool>> r_noBorder(
 static Cvar::Modified<Cvar::Range<Cvar::Cvar<int>>> r_swapInterval(
 	"r_swapInterval", "enable vsync on every Nth frame, negative for apdative", Cvar::ARCHIVE, 0, -5, 5 );
 
-static Cvar::Cvar<std::string> r_glForceDriver(
-	"r_glForceDriver", "treat the OpenGL driver type as: 'icd' 'standalone' or 'opengl3'", Cvar::NONE, "");
 static Cvar::Cvar<std::string> r_glForceHardware(
 	"r_glForceHardware", "treat the GPU type as: 'r300' or 'generic'", Cvar::NONE, "");
 
@@ -1467,17 +1465,6 @@ static rserr_t GLimp_CheckOpenGLVersion( const glConfiguration &requestedConfigu
 		return rserr_t::RSERR_OLD_GL;
 	}
 
-	if ( glConfig2.glMajor < 3 || ( glConfig2.glMajor == 3 && glConfig2.glMinor < 2 ) )
-	{
-		// Shaders are supported, but not all OpenGL 3.x features
-		logger.Notice("Using GL3 Renderer in OpenGL 2.x mode..." );
-	}
-	else
-	{
-		logger.Notice("Using GL3 Renderer in OpenGL 3.x mode..." );
-		glConfig.driverType = glDriverType_t::GLDRV_OPENGL3;
-	}
-
 	return rserr_t::RSERR_OK;
 }
 
@@ -2594,19 +2581,6 @@ static const int R_MODE_FALLBACK = 3; // 640 * 480
 
 /* Support code for GLimp_Init */
 
-static void reportDriverType( bool force )
-{
-	static const char *const drivers[] = {
-		"integrated", "stand-alone", "OpenGL 3+", "Mesa"
-	};
-	if (glConfig.driverType > glDriverType_t::GLDRV_UNKNOWN && (unsigned) glConfig.driverType < ARRAY_LEN( drivers ) )
-	{
-		logger.Notice("%s graphics driver class '%s'",
-		           force ? "User has forced" : "Detected",
-		           drivers[Util::ordinal(glConfig.driverType)] );
-	}
-}
-
 static void reportHardwareType( bool force )
 {
 	static const char *const hardware[] = {
@@ -2630,7 +2604,7 @@ of OpenGL
 */
 bool GLimp_Init()
 {
-	glConfig.driverType = glDriverType_t::GLDRV_ICD;
+	glConfig.driverType = glDriverType_t::GLDRV_OPENGL3;
 
 	r_sdlDriver = Cvar_Get( "r_sdlDriver", "", CVAR_ROM );
 	r_allowResize = Cvar_Get( "r_allowResize", "0", CVAR_LATCH );
@@ -2821,34 +2795,18 @@ bool GLimp_Init()
 		}
 	}
 
-	if ( glConfig2.hardwareVendor == glHardwareVendor_t::ATI
-		&& glConfig.driverType != glDriverType_t::GLDRV_OPENGL3 )
+	if ( glConfig2.hardwareVendor == glHardwareVendor_t::ATI &&
+	     std::make_pair( glConfig2.glMajor, glConfig2.glMinor ) < std::make_pair( 3, 2 ) )
 	{
 		glConfig.hardwareType = glHardwareType_t::GLHW_R300;
 	}
 
-	reportDriverType( false );
 	reportHardwareType( false );
 
 	{ // allow overriding where the user really does know better
-		Cvar::Latch( r_glForceDriver );
 		Cvar::Latch( r_glForceHardware );
-		glDriverType_t   driverType   = glDriverType_t::GLDRV_UNKNOWN;
 		glHardwareType_t hardwareType = glHardwareType_t::GLHW_UNKNOWN;
 
-		if      ( Str::IsIEqual( r_glForceDriver.Get(), "icd" ) )
-		{
-			driverType = glDriverType_t::GLDRV_ICD;
-		}
-		else if ( Str::IsIEqual( r_glForceDriver.Get(), "standalone" ) )
-		{
-			driverType = glDriverType_t::GLDRV_STANDALONE;
-		}
-		else if ( Str::IsIEqual( r_glForceDriver.Get(), "opengl3" ) )
-		{
-			driverType = glDriverType_t::GLDRV_OPENGL3;
-		}
-
 		if      ( Str::IsIEqual( r_glForceHardware.Get(), "generic" ) )
 		{
 			hardwareType = glHardwareType_t::GLHW_GENERIC;
@@ -2858,12 +2816,6 @@ bool GLimp_Init()
 			hardwareType = glHardwareType_t::GLHW_R300;
 		}
 
-		if ( driverType != glDriverType_t::GLDRV_UNKNOWN )
-		{
-			glConfig.driverType = driverType;
-			reportDriverType( true );
-		}
-
 		if ( hardwareType != glHardwareType_t::GLHW_UNKNOWN )
 		{
 			glConfig.hardwareType = hardwareType;