[opengl] merge (part 1?)

src/StepMania.cpp

@@ -469,7 +469,6 @@ struct VideoCardDefaults
 	}
 } const g_VideoCardDefaults[] = 
 {
-/*
 	VideoCardDefaults(
 		"Xbox",
 		"d3d",
@@ -478,10 +477,9 @@ struct VideoCardDefaults
 		2048,
 		true
 	),
-*/
 	VideoCardDefaults(
 		"Voodoo *5",
-		"opengl",	// received 3 reports of opengl crashing. -Chris
+		"d3d,opengl",	// received 3 reports of opengl crashing. -Chris
 		640,480,
 		32,32,32,
 		2048,
@@ -489,7 +487,7 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"Voodoo|3dfx", // all other Voodoos: some drivers don't identify which one
-		"opengl",
+		"d3d,opengl",
 		640,480,
 		16,16,16,
 		256,
@@ -497,7 +495,7 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"Radeon.* 7|Wonder 7500|ArcadeVGA",	// Radeon 7xxx, RADEON Mobility 7500
-		"opengl",	// movie texture performance is terrible in OpenGL, but fine in D3D.
+		"d3d,opengl",	// movie texture performance is terrible in OpenGL, but fine in D3D.
 		640,480,
 		16,16,16,
 		2048,
@@ -505,7 +503,7 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"GeForce|Radeon|Wonder 9|Quadro",
-		"opengl",
+		"opengl,d3d",
 		640,480,
 		32,32,32,	// 32 bit textures are faster to load
 		2048,
@@ -513,7 +511,7 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"TNT|Vanta|M64",
-		"opengl",
+		"opengl,d3d",
 		640,480,
 		16,16,16,	// Athlon 1.2+TNT demonstration w/ movies: 70fps w/ 32bit textures, 86fps w/ 16bit textures
 		2048,
@@ -521,13 +519,12 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"G200|G250|G400",
-		"opengl",
+		"d3d,opengl",
 		640,480,
 		16,16,16,
 		2048,
 		false	// broken, causes black screen
 	),
-/*
 	VideoCardDefaults(
 		"Savage",
 		"d3d",
@@ -551,10 +548,9 @@ struct VideoCardDefaults
 		256,
 		false
 	),
-*/
 	VideoCardDefaults(
 		"RAGE MOBILITY-M1",
-		"opengl",	// Vertex alpha is broken in OpenGL, but not D3D. -Chris
+		"d3d,opengl",	// Vertex alpha is broken in OpenGL, but not D3D. -Chris
 		400,300,	// lower resolution for 60fps
 		16,16,16,
 		256,
@@ -562,7 +558,7 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"Mobility M3",	// ATI Rage Mobility 128 (AKA "M3")
-		"opengl",	// bad movie texture performance in opengl
+		"d3d,opengl",	// bad movie texture performance in opengl
 		640,480,
 		16,16,16,
 		1024,
@@ -570,7 +566,7 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"Intel.*82810|Intel.*82815",
-		"opengl",// OpenGL is 50%+ faster than D3D w/ latest Intel drivers.  -Chris
+		"opengl,d3d",// OpenGL is 50%+ faster than D3D w/ latest Intel drivers.  -Chris
 		512,384,	// lower resolution for 60fps
 		16,16,16,
 		512,
@@ -578,15 +574,15 @@ struct VideoCardDefaults
 	),
 	VideoCardDefaults(
 		"Intel*Extreme Graphics",
-		"opengl",	// OpenGL blue screens w/ XP drivers from 6-21-2002
+		"d3d",	// OpenGL blue screens w/ XP drivers from 6-21-2002
 		640,480,
 		16,16,16,	// slow at 32bpp
 		1024,
 		false
 	),
 	VideoCardDefaults(
-		"Intel.*", /* fallback: all unknown Intel cards to  since Intel is notoriously bad at OpenGL */
-		"opengl",
+		"Intel.*", /* fallback: all unknown Intel cards to D3D, since Intel is notoriously bad at OpenGL */
+		"d3d,opengl",
 		640,480,
 		16,16,16,
 		2048,
@@ -599,17 +595,17 @@ struct VideoCardDefaults
 		// bug 764830: ASSERT fail after glDeleteTextures for "VIA Tech VT8361/VT8601 Graphics Controller"
 		// bug 791950: AV in glsis630!DrvSwapBuffers for "SiS 630/730"
 		"Trident Video Accelerator CyberBlade|VIA.*VT|SiS 6*",
-		"opengl",
+		"d3d,opengl",
 		640,480,
 		16,16,16,
 		2048,
 		false
 	),
 	VideoCardDefaults(
-		/* Unconfirmed texture problems on this; let's try  since it's
+		/* Unconfirmed texture problems on this; let's try D3D, since it's
 		 * a VIA/S3 chipset. */
 		"VIA/S3G KM400/KN400",
-		"opengl",
+		"d3d,opengl",
 		640,480,
 		16,16,16,
 		2048,
@@ -627,7 +623,7 @@ struct VideoCardDefaults
 		// Default graphics settings used for all cards that don't match above.
 		// This must be the very last entry!
 		"",
-		"opengl",
+		"opengl,d3d",
 		640,480,
 		32,32,32,
 		2048,
@@ -771,9 +767,10 @@ RageDisplay *CreateDisplay()
 		}
 		else if( sRenderer.CompareNoCase("d3d")==0 )
 		{
-#if defined(SUPPORT_D3D)
-			pRet = new RageDisplay_D3D;
-#endif
+// TODO: ANGLE/RageDisplay_Modern
+//#if defined(SUPPORT_D3D)
+//			pRet = new RageDisplay_D3D;
+//#endif
 		}
 		else if( sRenderer.CompareNoCase("null")==0 )
 		{
@@ -1571,3 +1568,4 @@ void HandleInputEvents(float fDeltaTime)
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+>>>>>>> other