1 files changed, 93 insertions, 49 deletions
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 56de9c610a..da888bc64d 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -47,8 +47,12 @@ ATI ASUS EAH26xx				.*ATI.*ASUS.*EAH26.*				3		1
 ATI ASUS EAH34xx				.*ATI.*ASUS.*EAH34.*				1		1
 ATI ASUS EAH36xx				.*ATI.*ASUS.*EAH36.*				3		1
 ATI ASUS EAH38xx				.*ATI.*ASUS.*EAH38.*				3		1
+ATI ASUS EAH43xx				.*ATI.*ASUS.*EAH43.*				1		1
+ATI ASUS EAH45xx				.*ATI.*ASUS.*EAH45.*				1		1
 ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*				3		1
-ATI Radeon X1xxx				.*ATI.*ASUS.*X1.*					2		1
+ATI ASUS EAH57xx				.*ATI.*ASUS.*EAH57.*				3		1
+ATI ASUS EAH58xx				.*ATI.*ASUS.*EAH58.*				3		1
+ATI Radeon X1xxx				.*ATI.*ASUS.*X1.*					3		1
 ATI Radeon X7xx					.*ATI.*ASUS.*X7.*					1		1
 ATI Radeon X500					.*ATI.*Diamond X5.*					1		1
 ATI Radeon X13xx				.*ATI.*Diamond X13.*				1		1
@@ -68,40 +72,51 @@ ATI M56							.*ATI.*M56.*						1		1
 ATI M71							.*ATI.*M71.*						1		1
 ATI M72							.*ATI.*M72.*						1		1
 ATI M76							.*ATI.*M76.*						3		1
-ATI Mobility Radeon 7xxx		.*ATI.*Mobility.*Radeon 7.*			0		1
-ATI Mobility Radeon 8xxx		.*ATI.*Mobility.*Radeon 8.*			0		1
-ATI Mobility Radeon 9800		.*ATI.*Mobility.*98.*				1		1
-ATI Mobility Radeon 9700		.*ATI.*Mobility.*97.*				1		1
-ATI Mobility Radeon 9600		.*ATI.*Mobility.*96.*				0		1
-ATI Mobility Radeon HD 2300		.*ATI.*Mobility.*HD.*23.*			1		1
-ATI Mobility Radeon HD 2400		.*ATI.*Mobility.*HD.*24.*			1		1
-ATI Mobility Radeon HD 2600		.*ATI.*Mobility.*HD.*26.*			3		1
-ATI Mobility Radeon HD 3400		.*ATI.*Mobility.*HD.*34.*			1		1
-ATI Mobility Radeon HD 3600		.*ATI.*Mobility.*HD.*36.*			3		1
-ATI Mobility Radeon HD 3800		.*ATI.*Mobility.*HD.*38.*			3		1
-ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*				0		1
-ATI Mobility Radeon X2xxx		.*ATI.*Mobility.*X2.*				0		1
-ATI Mobility Radeon X3xx		.*ATI.*Mobility.*X3.*				1		1
-ATI Mobility Radeon X6xx		.*ATI.*Mobility.*X6.*				1		1
-ATI Mobility Radeon X7xx		.*ATI.*Mobility.*X7.*				1		1
-ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*				0		1
-ATI Mobility Radeon				.*ATI.*Mobility.*					0		1
-ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				0		1
-ATI Radeon HD 2400				.*ATI.*Radeon HD.*24.*				1		1
-ATI Radeon HD 2600				.*ATI.*Radeon HD 26.*				2		1
-ATI Radeon HD 2900				.*ATI.*Radeon HD 29.*				3		1
-ATI Radeon HD 3200				.*ATI.*Radeon.*HD.*32.*				1		1
-ATI Radeon HD 3300				.*ATI.*Radeon HD.*33.*				1		1
-ATI Radeon HD 3400				.*ATI.*Radeon HD.*34.*				1		1
-ATI Radeon HD 3600				.*ATI.*Radeon HD.*36.*				3		1
-ATI Radeon HD 3800				.*ATI.*Radeon HD.*38.*				3		1
-ATI Radeon HD 4300				.*ATI.*Radeon HD 43.*				1		1
-ATI Radeon HD 4500				.*ATI.*Radeon HD 45.*				2		1
-ATI Radeon HD 4600				.*ATI.*Radeon HD 46.*				3		1
-ATI Radeon HD 4800				.*ATI.*Radeon.*HD.*48.*				3		1
+ATI Mobility Radeon 4100		.*ATI.*Mobility *41.*				0		1
+ATI Mobility Radeon 7xxx		.*ATI.*Mobility *Radeon 7.*			0		1
+ATI Mobility Radeon 8xxx		.*ATI.*Mobility *Radeon 8.*			0		1
+ATI Mobility Radeon 9800		.*ATI.*Mobility *98.*				0		1
+ATI Mobility Radeon 9700		.*ATI.*Mobility *97.*				0		1
+ATI Mobility Radeon 9600		.*ATI.*Mobility *96.*				0		1
+ATI Mobility Radeon HD 2300		.*ATI.*Mobility *HD *23.*			1		1
+ATI Mobility Radeon HD 2400		.*ATI.*Mobility *HD *24.*			1		1
+ATI Mobility Radeon HD 2600		.*ATI.*Mobility *HD *26.*			3		1
+ATI Mobility Radeon HD 3400		.*ATI.*Mobility *HD *34.*			1		1
+ATI Mobility Radeon HD 3600		.*ATI.*Mobility *HD *36.*			3		1
+ATI Mobility Radeon HD 3800		.*ATI.*Mobility *HD *38.*			3		1
+ATI Mobility Radeon HD 5400		.*ATI.*Mobility *HD *54.*			1		1
+ATI Mobility Radeon HD 5500		.*ATI.*Mobility *HD *55.*			1		1
+ATI Mobility Radeon X1xxx		.*ATI.*Mobility *X1.*				0		1
+ATI Mobility Radeon X2xxx		.*ATI.*Mobility *X2.*				0		1
+ATI Mobility Radeon X3xx		.*ATI.*Mobility *X3.*				1		1
+ATI Mobility Radeon X6xx		.*ATI.*Mobility *X6.*				1		1
+ATI Mobility Radeon X7xx		.*ATI.*Mobility *X7.*				1		1
+ATI Mobility Radeon Xxxx		.*ATI.*Mobility *X.*				0		1
+ATI Radeon HD 2300				.*ATI.*Radeon HD *23.*				0		1
+ATI Radeon HD 2400				.*ATI.*Radeon HD *24.*				1		1
+ATI Radeon HD 2600				.*ATI.*Radeon HD *26.*				2		1
+ATI Radeon HD 2900				.*ATI.*Radeon HD *29.*				3		1
+ATI Radeon HD 3200				.*ATI.*Radeon *HD *32.*				0		1
+ATI Radeon HD 3300				.*ATI.*Radeon HD *33.*				1		1
+ATI Radeon HD 3400				.*ATI.*Radeon HD *34.*				1		1
+ATI Radeon HD 3600				.*ATI.*Radeon HD *36.*				3		1
+ATI Radeon HD 3800				.*ATI.*Radeon HD *38.*				3		1
+ATI Radeon HD 4200				.*ATI.*Radeon HD *42.*				1		1
+ATI Radeon HD 4300				.*ATI.*Radeon HD *43.*				1		1
+ATI Radeon HD 4500				.*ATI.*Radeon HD *45.*				3		1
+ATI Radeon HD 4600				.*ATI.*Radeon HD *46.*				3		1
+ATI Radeon HD 4700				.*ATI.*Radeon HD *47.*				3		1
+ATI Radeon HD 4800				.*ATI.*Radeon.*HD *48.*				3		1
+ATI Radeon HD 5400				.*ATI.*Radeon.*HD *54.*				3		1
+ATI Radeon HD 5500				.*ATI.*Radeon.*HD *55.*				3		1
+ATI Radeon HD 5600				.*ATI.*Radeon.*HD *56.*				3		1
+ATI Radeon HD 5700				.*ATI.*Radeon.*HD *57.*				3		1
+ATI Radeon HD 5800				.*ATI.*Radeon.*HD *58.*				3		1
+ATI Radeon HD 5900				.*ATI.*Radeon.*HD *59.*				3		1
 ATI Radeon OpenGL				.*ATI.*Radeon OpenGL.* 				0		0
 ATI Radeon 2100					.*ATI.*Radeon 21.*					0		1
-ATI Radeon 3100					.*ATI.*Radeon 31.*					1		1
+ATI Radeon 3000					.*ATI.*Radeon 30.*					0		1
+ATI Radeon 3100					.*ATI.*Radeon 31.*					0		1
 ATI Radeon 7xxx					.*ATI.*Radeon 7.*					0		1
 ATI Radeon 8xxx					.*ATI.*Radeon 8.*					0		1
 ATI Radeon 9000					.*ATI.*Radeon 90.*					0		1
@@ -120,12 +135,12 @@ ATI Radeon VE					.*ATI.*Radeon.*VE.*					0		0
 ATI Radeon X1000				.*ATI.*Radeon *X10.*				0		1
 ATI Radeon X1200				.*ATI.*Radeon *X12.*				0		1
 ATI Radeon X1300				.*ATI.*Radeon *X13.*				1		1
-ATI Radeon X1400				.*ATI.*Radeon X14.*					1		1
-ATI Radeon X1500				.*ATI.*Radeon X15.*					1		1
+ATI Radeon X1400				.*ATI.*Radeon *X14.*				1		1
+ATI Radeon X1500				.*ATI.*Radeon *X15.*				1		1
 ATI Radeon X1600				.*ATI.*Radeon *X16.*				1		1
-ATI Radeon X1700				.*ATI.*Radeon X17.*					1		1
-ATI Radeon X1800				.*ATI.*Radeon X18.*					3		1
-ATI Radeon X1900				.*ATI.*Radeon X19.*					3		1
+ATI Radeon X1700				.*ATI.*Radeon *X17.*				1		1
+ATI Radeon X1800				.*ATI.*Radeon *X18.*				3		1
+ATI Radeon X1900				.*ATI.*Radeon *X19.*				3		1
 ATI Radeon X300					.*ATI.*Radeon *X3.*					0		1
 ATI Radeon X400					.*ATI.*Radeon X4.*					0		1
 ATI Radeon X500					.*ATI.*Radeon X5.*					0		1
@@ -152,19 +167,46 @@ Intel 945G						.*Intel.*945G.*						0		1
 Intel 950						.*Intel.*950.*						0		1
 Intel 965						.*Intel.*965.*						0		1
 Intel G33						.*Intel.*G33.*						0		0
+Intel G41						.*Intel.*G41.*						0		1
 Intel G45						.*Intel.*G45.*						0		1
 Intel Bear Lake					.*Intel.*Bear Lake.*				0		0
 Intel Broadwater 				.*Intel.*Broadwater.*				0		0
 Intel Brookdale					.*Intel.*Brookdale.*				0		0
 Intel Cantiga					.*Intel.*Cantiga.*					0		0
-Intel Eaglelake					.*Intel.*Eaglelake.*				0		0
+Intel Eaglelake					.*Intel.*Eaglelake.*				0		1
+Intel Graphics Media HD			.*Intel(R) Graphics Media.*HD.*		0		1
+Intel HD Graphics				.*Intel(R) HD Graphics.*			0		1
+Intel Mobile 4 Series			.*Intel.*Mobile.*4 Series.*			0		1
+Intel Media Graphics HD			.*Intel Media Graphics HD.*			0		1
 Intel Montara					.*Intel.*Montara.*					0		0
+Intel Pineview					.*Intel.*Pineview.*					0		1
 Intel Springdale				.*Intel.*Springdale.*				0		0
 Matrox							.*Matrox.*							0		0
 Mesa							.*Mesa.*							0		0
-NVIDIA GTX 260					.*NVIDIA.*GeForce.*GTX.*26.*		3		1
-NVIDIA GTX 280					.*NVIDIA.*GeForce.*GTX.*28.*		3		1
-NVIDIA GTX 290					.*NVIDIA.*GeForce.*GTX.*29.*		3		1
+NVIDIA 310M						.*NVIDIA.*GeForce 310M.*			0		1
+NVIDIA 310						.*NVIDIA.*GeForce 310.*				0		1
+NVIDIA 320M						.*NVIDIA.*GeForce 320M.*			0		1
+NVIDIA G100M					.*NVIDIA.*GeForce G *100M.*			0		1
+NVIDIA G102M					.*NVIDIA.*GeForce G *102M.*			0		1
+NVIDIA G103M					.*NVIDIA.*GeForce G *103M.*			0		1
+NVIDIA G105M					.*NVIDIA.*GeForce G *105M.*			0		1
+NVIDIA G210M					.*NVIDIA.*GeForce G210M.*			0		1
+NVIDIA GT 120					.*NVIDIA.*GeForce GT 12.*			1		1
+NVIDIA GT 130					.*NVIDIA.*GeForce GT 13.*			1		1
+NVIDIA GT 220					.*NVIDIA.*GeForce GT 22.*			1		1
+NVIDIA GT 230					.*NVIDIA.*GeForce GT 23.*			1		1
+NVIDIA GT 240					.*NVIDIA.*GeForce GT 24.*			1		1
+NVIDIA GT 320					.*NVIDIA.*GeForce GT 32.*			0		1
+NVIDIA GT 330M					.*NVIDIA.*GeForce GT 330M.*			1		1
+NVIDIA GTS 240					.*NVIDIA.*GeForce GTS 24.*			1		1
+NVIDIA GTS 250					.*NVIDIA.*GeForce GTS 25.*			3		1
+NVIDIA GTS 360M					.*NVIDIA.*GeForce GTS 360M.*		3		1
+NVIDIA GTX 260					.*NVIDIA.*GeForce GTX 26.*			3		1
+NVIDIA GTX 270					.*NVIDIA.*GeForce GTX 27.*			3		1
+NVIDIA GTX 280					.*NVIDIA.*GeForce GTX 28.*			3		1
+NVIDIA GTX 290					.*NVIDIA.*GeForce GTX 29.*			3		1
+NVIDIA GTX 470					.*NVIDIA.*GeForce GTX 47.*			3		1
+NVIDIA GTX 480					.*NVIDIA.*GeForce GTX 48.*			3		1
 NVIDIA C51						.*NVIDIA.*C51.*						0		1
 NVIDIA G72						.*NVIDIA.*G72.*						1		1
 NVIDIA G73						.*NVIDIA.*G73.*						1		1
@@ -188,23 +230,25 @@ NVIDIA GeForce 7100				.*NVIDIA.*GeForce 71.*				0		1
 NVIDIA GeForce 7200				.*NVIDIA.*GeForce 72.*				1		1
 NVIDIA GeForce 7300				.*NVIDIA.*GeForce 73.*				1		1
 NVIDIA GeForce 7500				.*NVIDIA.*GeForce 75.*				1		1
-NVIDIA GeForce 7600				.*NVIDIA.*GeForce 76.*				2		1
-NVIDIA GeForce 7800				.*NVIDIA.*GeForce.*78.*				2		1
-NVIDIA GeForce 7900				.*NVIDIA.*GeForce.*79.*				2		1
+NVIDIA GeForce 7600				.*NVIDIA.*GeForce 76.*				1		1
+NVIDIA GeForce 7800				.*NVIDIA.*GeForce 78.*				1		1
+NVIDIA GeForce 7900				.*NVIDIA.*GeForce 79.*				1		1
 NVIDIA GeForce 8100				.*NVIDIA.*GeForce 81.*				1		1
 NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*				1		1
 NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*				1		1
 NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*				1		1
-NVIDIA GeForce 8500				.*GeForce 85.*						3		1
+NVIDIA GeForce 8500				.*GeForce 85.*						1		1
 NVIDIA GeForce 8600M			.*NVIDIA.*GeForce.*8600M.*			1		1
 NVIDIA GeForce 8600				.*NVIDIA.*GeForce 86.*				3		1
 NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*				3		1
 NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*				3		1
+NVIDIA GeForce 9100				.*NVIDIA.*GeForce 9100.*			0		1
+NVIDIA GeForce 9200				.*NVIDIA.*GeForce 9200.*			0		1
 NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*			1		1
 NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*			1		1
 NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*			2		1
-NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*			2		1
-NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*			2		1
+NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*			3		1
+NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*			3		1
 NVIDIA GeForce 9300				.*NVIDIA.*GeForce 93.*				1		1
 NVIDIA GeForce 9400				.*GeForce 94.*						1		1
 NVIDIA GeForce 9500				.*NVIDIA.*GeForce 95.*				2		1
@@ -244,6 +288,7 @@ NVIDIA G84						.*G84.*								1		1
 NVIDIA G92						.*G92.*								3		1
 NVIDIA G94						.*G94.*								3		1
 NVIDIA GeForce Go 6				.*GeForce Go 6.*					1		1
+NVIDIA ION						.*NVIDIA ION.*						1		1
 NVIDIA NB9M						.*GeForce NB9M.*					1		1
 NVIDIA NB9P						.*GeForce NB9P.*					1		1
 NVIDIA GeForce PCX				.*GeForce PCX.*						0		1
@@ -263,7 +308,6 @@ NVIDIA Quadro FX 4500			.*Quadro.*FX.*4500.*				3		1
 NVIDIA Quadro FX				.*Quadro FX.*						1		1
 NVIDIA Quadro NVS				.*Quadro NVS.*						0		1
 NVIDIA RIVA TNT					.*RIVA TNT.*						0		0
-NVIDIA PCI						.*NVIDIA.*/PCI/SSE2					0		0
 S3								.*S3 Graphics.*						0		0
 SiS								SiS.*								0		0
 Trident							Trident.*							0		0