diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-13 10:51:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-13 10:51:31 -0400 |
| commit | 0665d3f2e65b75db55134b5ad3fc1c8182b05f9e (patch) | |
| tree | b8b322d7b7613b9a18539430184e4f13f7192131 | |
| parent | 5b42f6f25b9b8fa4bc3ccfe37069a447f89c6327 (diff) | |
lowercase gpu string and recognizers in gpu_table_tester to match the behavior of the real code
| -rw-r--r-- | indra/newview/tests/gpus_results.txt | 14 | ||||
| -rwxr-xr-x | scripts/gpu_table_tester | 9 |
2 files changed, 11 insertions, 12 deletions
diff --git a/indra/newview/tests/gpus_results.txt b/indra/newview/tests/gpus_results.txt index 7e9a064921..280952e7c5 100644 --- a/indra/newview/tests/gpus_results.txt +++ b/indra/newview/tests/gpus_results.txt @@ -26,7 +26,7 @@ ATI All-in-Wonder X1900 ATI All-in-Wonder X600 supported 1 ATI All-in-Wonder X600 ATI All-in-Wonder X800 supported 2 ATI All-in-Wonder X800 ATI Diamond X1xxx supported 0 ATI Radeon X1xxx -ATI Display Adapter UNRECOGNIZED +ATI Display Adapter supported 0 ATI Display Adapter ATI FireGL supported 0 ATI FireGL ATI FireGL 5200 supported 0 ATI FireGL ATI FireGL 5xxx supported 0 ATI FireGL @@ -502,9 +502,9 @@ ATI Technologies Inc. HIGHTECH EXCALIBUR RADEON 9550SE Series ATI Technologies Inc. HIGHTECH EXCALIBUR X700 PRO supported 0 ATI Technologies ATI Technologies Inc. M21 x86/MMX/3DNow!/SSE2 supported 0 ATI Technologies ATI Technologies Inc. M76M supported 3 ATI M76 -ATI Technologies Inc. MOBILITY RADEON 7500 DDR x86/SSE2 supported 0 ATI Mobility Radeon -ATI Technologies Inc. MOBILITY RADEON 9000 DDR x86/SSE2 supported 0 ATI Mobility Radeon -ATI Technologies Inc. MOBILITY RADEON 9000 IGPRADEON 9100 IGP DDR x86/SSE2 supported 0 ATI Mobility Radeon +ATI Technologies Inc. MOBILITY RADEON 7500 DDR x86/SSE2 supported 0 ATI Mobility Radeon 7xxx +ATI Technologies Inc. MOBILITY RADEON 9000 DDR x86/SSE2 supported 0 ATI Mobility Radeon Xxxx +ATI Technologies Inc. MOBILITY RADEON 9000 IGPRADEON 9100 IGP DDR x86/SSE2 supported 0 ATI Mobility Radeon Xxxx ATI Technologies Inc. MOBILITY RADEON 9600 x86/SSE2 supported 0 ATI Mobility Radeon 9600 ATI Technologies Inc. MOBILITY RADEON 9700 x86/SSE2 supported 1 ATI Mobility Radeon 9700 ATI Technologies Inc. MOBILITY RADEON X300 x86/SSE2 supported 1 ATI Mobility Radeon X3xx @@ -1453,9 +1453,9 @@ NVIDIA RIVA TNT NVIDIA RIVA TNT2/AGP/SSE2 unsupported 0 NVIDIA RIVA TNT NVIDIA RIVA TNT2/PCI/3DNOW! unsupported 0 NVIDIA RIVA TNT NVIDIA nForce unsupported 0 NVIDIA nForce -NVIDIA unknown board/AGP/SSE2 UNRECOGNIZED -NVIDIA unknown board/PCI/SSE2 UNRECOGNIZED -NVIDIA unknown board/PCI/SSE2/3DNOW! UNRECOGNIZED +NVIDIA unknown board/AGP/SSE2 unsupported 0 NVIDIA Generic +NVIDIA unknown board/PCI/SSE2 unsupported 0 NVIDIA Generic +NVIDIA unknown board/PCI/SSE2/3DNOW! unsupported 0 NVIDIA Generic Parallels and ATI Technologies Inc. Parallels using ATI Radeon HD 5670 OpenGL Engine supported 3 ATI Radeon HD 5600 Parallels and ATI Technologies Inc. Parallels using ATI Radeon HD 5750 OpenGL Engine supported 3 ATI Radeon HD 5700 Parallels and ATI Technologies Inc. Parallels using ATI Radeon HD 5770 OpenGL Engine supported 3 ATI Radeon HD 5700 diff --git a/scripts/gpu_table_tester b/scripts/gpu_table_tester index 2ad7ffc01e..4edf649994 100755 --- a/scripts/gpu_table_tester +++ b/scripts/gpu_table_tester @@ -126,8 +126,7 @@ while (<GPUS>) if ($errsOnLine == $ErrorsSeen) # no errors found on this line { - $lcregex = $regex; # the real gpu table parser lowercases each recognizer - push @InOrder,$lcregex; + push @InOrder,$regex; $NameLine{$name} = $INPUT_LINE_NUMBER; $RecognizerLine{$regex} = $INPUT_LINE_NUMBER; $Name{$regex} = $name; @@ -148,13 +147,13 @@ my %RecognizedBy; while (<>) # Loop over input lines { chomp; - my $lowerInput = $_; - lc lowerInput; # the real gpu table parser lowercases the input string + my $lcInput = lc $_; # the real gpu table parser lowercases the input string my $recognizer; $RecognizedBy{$_} = 'UNRECOGNIZED'; foreach $recognizer ( @InOrder ) # note early exit if recognized { - if ( m/$recognizer/ ) + my $lcRecognizer = lc $recognizer; # the real gpu table parser lowercases the recognizer + if ( $lcInput =~ m/$lcRecognizer/ ) { $RecognizedBy{$_} = $recognizer; last; # exit recognizer loop |