force D3D for Savage cards (until we figure what the error in glTex2D is)

This commit is contained in:
Chris Danford
2003-06-07 10:36:39 +00:00
parent 5195cbec76
commit 4a5280f71d
2 changed files with 15 additions and 12 deletions
@@ -1,6 +1,3 @@
[VideoCards]
NumEntries=4
[0000]
DriverRegex=Voodoo3|3dfx
Renderers=d3d
@@ -28,9 +25,18 @@ DisplayColor=16
TextureColor=16
AntiAliasing=0
[0003]
DriverRegex=Savage
Renderers=d3d // OpenGL has problems loading textures. I'll investigate when my Savage card comes. -Chris
Width=640
Height=480
DisplayColor=16
TextureColor=16
AntiAliasing=0
// Default graphics settings used for all cards that don't match above.
// This must be the very last entry!
[0003]
[0004]
DriverRegex=
Renderers=opengl,d3d
Width=640
+5 -8
View File
@@ -260,20 +260,17 @@ RageDisplay *CreateDisplay()
{
// Apply default graphic settings for this card
IniFile ini;
ini.SetPath( "Data/VideoCards.ini" );
ini.SetPath( "Data/VideoCardDefaults.ini" );
if(!ini.ReadFile())
RageException::Throw( "Couldn't read VideoCards.ini." );
RageException::Throw( "Couldn't read Data/VideoCardDefaults.ini." );
int iNumEntries = 0;
if(!ini.GetValueI( "VideoCards", "NumEntries", iNumEntries ))
RageException::Throw( "Couldn't read NumEntries in VideoCards.ini." );
for( int i=0; i<iNumEntries; i++ )
for( int i=0; true; i++ )
{
CString sKey = ssprintf("%04d",i);
CString sDriverRegex;
ini.GetValue( sKey, "DriverRegex", sDriverRegex );
if( !ini.GetValue( sKey, "DriverRegex", sDriverRegex ) )
break;
Regex regex( sDriverRegex );
if( !regex.Compare(sVideoDriver) )
continue; // skip