Pass to fix new unmatched entries

1 files changed, 30 insertions, 22 deletions

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 36a98e35a2..95eabd4bae 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -112,6 +112,7 @@ ATI Mobility Radeon X1000				.*ATI.*Mobility.*Radeon ?X1..*								2	1	0	2.1
 ATI Mobility Radeon X1200				.*ATI.*Mobility.*Radeon ?X12.*								2	1	0	2.1
 ATI Mobility Radeon X2000				.*ATI.*Mobility.*Radeon ?X20.*								2	1	0	2.1
 ATI Mobility Radeon X2300				.*ATI.*Mobility.*Radeon ?X23.*								2	1	0	2.1
+ATI Mobility Radeon X2500				.*ATI.*Mobility.*Radeon ?X25.*								2	1	0	2.1
 ATI Mobility Radeon XX000				.*ATI.*Mobility.*Radeon ?Xx.*								2	1	0	2.1
 ATI Radeon HD 5xx						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)5x.		1	1	1	4
 ATI Radeon HD 6200D/G/M				.*ATI.*AMD Radeon.* (HD|HD )62..[DGM].*				3	1	0	4.2
@@ -266,6 +267,8 @@ AMD JUNIPER (HD 5700)					.*(AMD|ATI).*Juniper.*								3	1	0	0
 AMD PARK								.*(AMD|ATI).*Park.*									3	1	0	0
 AMD REDWOOD (HD 5500/5600)				.*(AMD|ATI).*Redwood.*								3	1	0	1.4
 AMD TURKS (HD 6500/6600)				.*(AMD|ATI).*Turks.*								3	1	0	2.1
+AMD PITCAIRN (HD 7870)					.*(AMD|ATI).*Pitcairn.*								3	1	0	2.1
+AMD TAHITI (HD 7000)					.*(AMD|ATI).*Tahiti.*								3	1	0	2.1
 AMD RS780 (HD 3200)						.*RS780.*											0	1	1	2.1
 AMD RS880 (HD 4200)						.*RS880.*											0	1	1	3.2
 AMD RV610 (HD 2400)						.*RV610.*											1	1	0	0
@@ -404,10 +407,10 @@ NVIDIA GT 140							.*NVIDIA .*GT 14.*									2	1	0	3.3
 NVIDIA GT 150							.*NVIDIA .*GT 15.*									2	1	1	3.3
 NVIDIA GTS 150							.*NVIDIA .*GTS 15.*									2	1	0	0
 NVIDIA 200								.*NVIDIA .[ ]+200[^0].*								2	1	1	3.3
-NVIDIA G200								.*NVIDIA .*G200.*							2	1	1	3.3
-NVIDIA G210								.*NVIDIA .*G210.*							3	1	1	3.3
-NVIDIA 205								.*NVIDIA .*[ ]+205.*							3	1	1	3.3
-NVIDIA 210								.*NVIDIA .*[ ]+210[^0].*							3	1	1	3.3
+NVIDIA G200								.*NVIDIA .*G[ ]*200.*							2	1	1	3.3
+NVIDIA G210								.*NVIDIA .*G[ ]*210.*							3	1	1	3.3
+NVIDIA 205								.*NVIDIA .*205[^0]*.*							3	1	1	3.3
+NVIDIA 210								.*NVIDIA .*210[^0]*.*							3	1	1	3.3
 NVIDIA GT 220							.*NVIDIA .*GT *22.*									2	1	1	3.3
 NVIDIA GT 230							.*NVIDIA .*GT *23.*									2	1	1	3.3
 NVIDIA GT 240							.*NVIDIA .*GT *24.*									4	1	1	3.3
@@ -418,13 +421,13 @@ NVIDIA GTX 260							.*NVIDIA .*GTX *26.*									4	1	1	3.3
 NVIDIA GTX 270							.*NVIDIA .*GTX *27.*									4	1	0	3.3
 NVIDIA GTX 280							.*NVIDIA .*GTX *28.*									4	1	1	3.3
 NVIDIA GTX 290							.*NVIDIA .*GTX *29.*									5	1	0	3.3
-NVIDIA 310								.*NVIDIA .*[ ]+310.*							3	1	1	3.3
-NVIDIA 315								.*NVIDIA .*[ ]+315.*							3	1	1	3.3
+NVIDIA 310								.*NVIDIA .*310[^0]*.*							3	1	1	3.3
+NVIDIA 315								.*NVIDIA .*315[^0]*.*							3	1	1	3.3
 NVIDIA GT 320							.*NVIDIA .*GT *32.*									3	1	0	3.3
 NVIDIA GT 330							.*NVIDIA .*GT *33.*									3	1	0	3.3
 NVIDIA GT 340							.*NVIDIA .*GT *34.*						3	1	0	0
-NVIDIA 405								.*NVIDIA .*[ ]+405.*									3	1	0	3.3
-NVIDIA 410								.*NVIDIA .*[ ]+410.*									3	1	0	3.3
+NVIDIA 405								.*NVIDIA .*405[^0]*.*									3	1	0	3.3
+NVIDIA 410								.*NVIDIA .*410[^0]*.*									3	1	0	3.3
 NVIDIA GT 415							.*NVIDIA .*GT *415.*									3	1	1	4.2
 NVIDIA GT 420							.*NVIDIA .*GT *42.*									3	1	1	4.2
 NVIDIA GT 430							.*NVIDIA .*GT *43.*									3	1	1	4.2
@@ -434,8 +437,8 @@ NVIDIA GTS 450							.*NVIDIA .*GTS *45.*									4	1	1	4.2
 NVIDIA GTX 460							.*NVIDIA .*GTX *46.*					5	1	1	4.3
 NVIDIA GTX 470							.*NVIDIA .*GTX *47.*									5	1	1	4.2
 NVIDIA GTX 480							.*NVIDIA .*GTX *48.*									5	1	1	4.2
-NVIDIA 505								.*NVIDIA .*505.*						3	1	0	0
-NVIDIA 510								.*NVIDIA .*510.*						3	1	0	0
+NVIDIA 505								.*NVIDIA .*505[^0]*.*						3	1	0	0
+NVIDIA 510								.*NVIDIA .*510[^0]*.*						3	1	0	0
 NVIDIA GT 520							.*NVIDIA .*GT *52.*									3	1	1	4.2
 NVIDIA GT 530							.*NVIDIA .*GT *53.*									3	1	1	4.2
 NVIDIA GT 540							.*NVIDIA .*GT *54.*									3	1	1	4.2
@@ -445,7 +448,7 @@ NVIDIA GTX 560							.*NVIDIA .*GTX *56.*									5	1	1	4.2
 NVIDIA GTX 570							.*NVIDIA .*GTX *57.*									5	1	1	4.2
 NVIDIA GTX 580							.*NVIDIA .*GTX *58.*					5	1	1	4.3
 NVIDIA GTX 590							.*NVIDIA .*GTX *59.*									5	1	1	4.2
-NVIDIA 605								.*NVIDIA .*605.*									3	1	1	4.2
+NVIDIA 605								.*NVIDIA .*605[^0]*.*									3	1	1	4.2
 NVIDIA GT 61x							.*NVIDIA .*GT 61.*									3	1	1	4.2
 NVIDIA GT 62x							.*NVIDIA .*GT 62.*									3	1	0	4.2
 NVIDIA GT 63x							.*NVIDIA .*GT 63.*									3	1	0	4.2
@@ -558,8 +561,6 @@ NVIDIA GeForce Go 7900					.*NVIDIA .*GeForce Go 79.*							1	1	1	2.1
 NVIDIA D9M								.*NVIDIA .*D9M.*									1	1	0	0
 NVIDIA G94								.*NVIDIA .*G94.*									3	1	0	0
 NVIDIA GeForce Go 6						.*GeForce Go 6.*									1	1	0	0
-NVIDIA ION 2							.*NVIDIA .*[ ]+[I][O][N] 2.*									2	1	0	0
-NVIDIA ION 								.*NVIDIA .*[ ]+[I][O][N].*									2	1	1	3.3
 NVIDIA NB8M								.*NVIDIA .*NB8M.*									1	1	0	0
 NVIDIA NB8P								.*NVIDIA .*NB8P.*									2	1	0	0
 NVIDIA NB9E								.*NVIDIA .*NB9E.*									3	1	0	0
@@ -589,10 +590,12 @@ NVIDIA MCP79							.*NVIDIA .*MCP79.*									1	1	0	0
 NVIDIA MCP7A							.*NVIDIA .*MCP7A.*									1	1	0	0
 NVIDIA Quadro2							.*Quadro2.*											0	1	0	1.5
 NVIDIA Quadro 1000M						.*Quadro.* (K1|1)00[0-9]M.*							2	1	0	4.2
+NVIDIA Quadro 1100M						.*Quadro.* *110[0-9]M.*								2	1	0	3.3
+NVIDIA Quadro K1000						.*Quadro.* (K1|1)00[0-9].*							2	1	0	4.2
 NVIDIA Quadro 2000 M/D					.*Quadro.* (K2|2)000.*								3	1	0	4.2
 NVIDIA Quadro 3000M						.*Quadro.* (K3|3)00[0-9]M.*							3	1	0	4.2
 NVIDIA Quadro 4000M						.*Quadro.* (K4|4)00[0-9]M.*							3	1	0	4.2
-NVIDIA Quadro 4000						.*Quadro 4000.*										3	1	0	4.2
+NVIDIA Quadro 4000						.*Quadro.* (K4|4)000.*										3	1	0	4.2
 NVIDIA Quadro 50x0 M					.*Quadro.* (K5|5)0.0.*									3	1	0	4.2
 NVIDIA Quadro 6000						.*Quadro.* (K6|6)000.*									3	1	0	0
 NVIDIA Quadro 400						.*Quadro.* 400.*									2	1	0	3.3
@@ -614,17 +617,22 @@ NVIDIA Quadro FX 4500					.*Quadro.*FX 45.*									3	1	0	2.1
 NVIDIA Quadro FX 880M					.*Quadro.*FX 88[0-9]M.*								3	1	0	3.3
 NVIDIA Quadro FX 4800					.*NVIDIA .*Quadro FX 4800.*							3	1	0	3.1
 NVIDIA Quadro FX						.*NVIDIA .*Quadro FX.*										1	1	0	3.3
-NVIDIA Quadro NVS 1xxM					.*NVIDIA .*Quadro NVS *1.[05]M.*								0	1	1	3.3
-NVIDIA Quadro NVS 300M					.*NVIDIA .*Quadro[ ]+NVS *30[0-9]M.*							2	1	0	0
-NVIDIA Quadro NVS 320M					.*NVIDIA .*Quadro[ ]+NVS *32[0-9]M.*							2	1	0	0
-NVIDIA Quadro NVS 2100M					.*NVIDIA .*Quadro[ ]+NVS *210[0-9]M.*							2	1	0	3.3
-NVIDIA Quadro NVS 3100M					.*NVIDIA .*Quadro[ ]+NVS *310[0-9]M.*							2	1	0	3.3
-NVIDIA Quadro NVS 4200M					.*NVIDIA .*Quadro[ ]+NVS *420[0-9]M.*							2	1	0	4.2
-NVIDIA Quadro NVS 5100M					.*NVIDIA .*Quadro[ ]+NVS *510[0-9]M.*							2	1	0	0
-NVIDIA Quadro NVS						.*NVIDIA .*Quadro[ ]+NVS										0	1	0	4.2
+NVIDIA Quadro NVS 1xxM					.*NVIDIA .*(Quadro) NVS *1.[05]M.*								0	1	1	3.3
+NVIDIA Quadro NVS 300M					.*NVIDIA .*(Quadro)*[ ]+NVS *30[0-9]M.*							2	1	0	0
+NVIDIA Quadro NVS 320M					.*NVIDIA .*(Quadro)*[ ]+NVS *32[0-9]M.*							2	1	0	0
+NVIDIA Quadro NVS 2100M					.*NVIDIA .*(Quadro)*[ ]+NVS *210[0-9]M.*							2	1	0	3.3
+NVIDIA Quadro NVS 3100M					.*NVIDIA .*(Quadro)*[ ]+NVS *310[0-9]M.*							2	1	0	3.3
+NVIDIA Quadro NVS 4200M					.*NVIDIA .*(Quadro)*[ ]+NVS *420[0-9]M.*							2	1	0	4.2
+NVIDIA Quadro NVS 5100M					.*NVIDIA .*(Quadro)*[ ]+NVS *510[0-9]M.*							2	1	0	0
+NVIDIA Quadro NVS 5200M					.*NVIDIA .*(Quadro)*[ ]+NVS *520[0-9]M.*							2	1	0	0
+NVIDIA Quadro NVS 5400M					.*NVIDIA .*(Quadro)*[ ]+NVS *540[0-9]M.*							2	1	0	0
+NVIDIA Quadro NVS						.*NVIDIA .*(Quadro)*[ ]+NVS										0	1	0	4.2
 NVIDIA Corporation N12P					.*NVIDIA .*N12P.*									1	1	1	4.1
 NVIDIA Corporation N11M					.*NVIDIA .*N11M.*									2	1	0	3.1
 NVIDIA RIVA TNT							.*RIVA TNT.*										0	0	0	1.5
+NVIDIA GRID								.*NVIDIA .*GRID.*										0	0	0	1.5
+NVIDIA ION 2							.*NVIDIA .* *[I][O][N] 2.*									2	1	0	0
+NVIDIA ION 								.*NVIDIA .* *[I][O][N].*									2	1	1	3.3
 S3										.*S3 *(Graphics)*.*										0	0	1	1.4
 SiS										SiS.*												0	0	1	1.5
 Trident									Trident.*											0	0	0	0