merge changes for 3.7.2-release

1 files changed, 291 insertions, 191 deletions

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 122577b132..8efc4ee87d 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -1,3 +1,4 @@
+//GPU_TABLE - that token on line 1 tags this as a gpu table file
 //
 // Categorizes graphics chips into various classes by name
 //
@@ -21,11 +22,11 @@
 //
 // Class Numbers:
 //		0 - Defaults to low graphics settings.	No shaders on by default
-//		1 - Defaults to mid graphics settings.	Basic shaders on by default
-//		2 - Defaults to high graphics settings.	 Atmospherics on by default.
-//		3 - Same as 2, but with lighting and shadows enabled.
-//		4 - Same as 3, but with ambient occlusion enabled.
-//		5 - Same as 4, but with shadows set to "Sun/Moon+Projectors."
+//		1 - Defaults to low-mid graphics settings.		Basic shaders on by default
+//		2 - Defaults to mid graphics settings.			Atmospherics on by default
+//		3 - Defaults to mid-high graphics settings.		Advanced Lighting Model on by default
+//		4 - Defaults to high graphics settings.			Ambient Occlusion on by default
+//		5 - Defaults to high-ultra graphics settings.	Shadows set to "Sun/Moon+Projectors."
 //
 // Supported Number:
 //		0 - We claim to not support this card.
@@ -34,7 +35,9 @@
 
 3Dfx									.*3Dfx.*											0	0	0	0
 3Dlabs									.*3Dlabs.*											0	0	0	0
+Hijacker								.*Mohr.*Hijacker.*									0	0	0	0
 ATI 3D-Analyze							.*ATI.*3D-Analyze.*									0	0	0	0
+ATI ARES								.*ATI.*ARES.*										0	0	0	0
 ATI All-in-Wonder 7500					.*ATI.*All-in-Wonder 75.*							0	1	0	0
 ATI All-in-Wonder 8500					.*ATI.*All-in-Wonder 85.*							0	1	0	0
 ATI All-in-Wonder 9200					.*ATI.*All-in-Wonder 92.*							0	1	0	0
@@ -46,15 +49,14 @@ ATI All-in-Wonder X1800					.*ATI.*All-in-Wonder X18.*							3	1	0	0
 ATI All-in-Wonder X1900					.*ATI.*All-in-Wonder X19.*							3	1	0	0
 ATI All-in-Wonder PCI-E					.*ATI.*All-in-Wonder.*PCI-E.*						1	1	0	0
 ATI All-in-Wonder Radeon				.*ATI.*All-in-Wonder Radeon.*						0	1	0	0
-ATI Radeon X1300						.*ATI.*(ASUS|Radeon).*X13.*							2	1	1	2.1
-ATI Radeon X1500						.*ATI.*(ASUS|Radeon).*X15.*							2	1	1	2.1
-ATI Radeon X1600						.*ATI.*(ASUS|Radeon).*X16.*							2	1	1	2.1
-ATI Radeon X1700						.*ATI.*(ASUS|Radeon).*X17.*							2	1	1	2.1
-ATI Radeon X1800						.*ATI.*(Radeon|Diamond) X18.* ?.*					3	1	1	2.1
-ATI Radeon X1900						.*ATI.*(Radeon|Diamond|ASUS) X19.* ?.*				2	1	1	2.1
-ATI Radeon X17xx						.*ATI.*(Radeon|Diamond) X17.* ?.*					1	1	1	2.1
-ATI Radeon X16xx						.*ATI.*(Radeon|Diamond) X17.* ?.*					1	1	1	2.1
-ATI Radeon X28xx						.*ATI.*(Radeon|Diamond) X28.. ?.*					1	1	1	2.1
+ATI Radeon X1300						.*ATI.*(Radeon|Diamond|ASUS) *X13.* ?.*							2	1	1	2.1
+ATI Radeon X1400						.*ATI.*(Radeon|Diamond|ASUS) *X14.* ?.*							2	1	1	2.1
+ATI Radeon X1500						.*ATI.*(Radeon|Diamond|ASUS) *X15.* ?.*							2	1	1	2.1
+ATI Radeon X1600						.*ATI.*(Radeon|Diamond|ASUS) *X16.* ?.*							2	1	1	2.1
+ATI Radeon X1700						.*ATI.*(Radeon|Diamond|ASUS) *X17.* ?.*							2	1	1	2.1
+ATI Radeon X1800						.*ATI.*(Radeon|Diamond|ASUS) *X18.* ?.*						3	1	1	2.1
+ATI Radeon X1900						.*ATI.*(Radeon|Diamond|ASUS) *X19.* ?.*				2	1	1	2.1
+ATI Radeon X2800						.*ATI.*(Radeon|Diamond|ASUS) *X28.* ?.*							2	1	1	2.1
 ATI Display Adapter						.*ATI.*display adapter.*							1	1	1	4.1
 ATI FireGL 5200							.*ATI.*FireGL V52.*									1	1	1	2.1
 ATI FireGL 5xxx							.*ATI.*FireGL V5.*									2	1	1	3.3
@@ -73,26 +75,6 @@ ATI M56									.*ATI.*M56.*										1	1	0	0
 ATI M71									.*ATI.*M71.*										1	1	0	0
 ATI M72									.*ATI.*M72.*										1	1	0	0
 ATI M76									.*ATI.*M76.*										3	1	0	0
-ATI Radeon HD 6300M						.*ATI.*AMD Radeon.* (HD|HD )63..M					2	1	1	4.2
-ATI Radeon HD 6400M						.*ATI.*AMD Radeon.* (HD|HD )64..M					2	1	1	4.2
-ATI Radeon HD 6500M						.*ATI.*AMD Radeon.* (HD|HD )65..M					2	1	1	4.2
-ATI Radeon HD 6600M						.*ATI.*AMD Radeon.* (HD 6|6)6..M					3	1	1	4.2
-ATI Radeon HD 6700M						.*ATI.*AMD Radeon.* (HD|HD )67..M					3	1	1	4.2
-ATI Radeon HD 6800M						.*ATI.*AMD Radeon.* (HD|HD )68..M					3	1	1	4.2
-ATI Radeon HD 6300G						.*ATI.*AMD Radeon.* (HD|HD )63..G					2	1	1	4.2
-ATI Radeon HD 6400G						.*ATI.*AMD Radeon.* (HD|HD )64..G					2	1	1	4.2
-ATI Radeon HD 6500G						.*ATI.*AMD Radeon.* (HD|HD )65..G					2	1	1	4.2
-ATI Radeon HD 6600G						.*ATI.*AMD Radeon.* (HD|HD )66..G					3	1	1	4.2
-ATI Radeon HD 7100						.*ATI.*(Radeon|ASUS).* (HD|HD )71.*					2	1	0	0
-ATI Radeon HD 7200						.*ATI.*(Radeon|ASUS).* (HD|HD )72.*					2	1	0	4.2
-ATI Radeon HD 7300						.*ATI.*(Radeon|ASUS).* (HD|HD )73.*					2	1	0	4.2
-ATI Radeon HD 7400						.*ATI.*(Radeon|ASUS).* (HD|HD )74.*					2	1	0	4.2
-ATI Radeon HD 7500						.*ATI.*(Radeon|ASUS).* (HD|HD )75.*					3	1	1	4.2
-ATI Radeon HD 7600						.*ATI.*(Radeon|ASUS).* (HD|HD )76.*					3	1	0	4.2
-ATI Radeon HD 7700						.*ATI.*(Radeon|ASUS).* (HD|HD )77.*					4	1	1	4.2
-ATI Radeon HD 7800						.*ATI.*(Radeon|ASUS).* (HD|HD )78.*					5	1	1	4.2
-ATI Radeon HD 7900						.*ATI.*(Radeon|ASUS).* (HD|HD )79.*					5	1	1	4.2
-ATI Radeon HD 7000 Series				.*ATI.*(Radeon|ASUS).* (HD|HD )7000 Series.*		3	1	1	4.2
 ATI Mobility Radeon 4100				.*ATI.*Mobility.* 41..								1	1	1	3.3
 ATI Mobility Radeon 5000				.*ATI.*Mobility.* 50..								1	1	1	4.2
 ATI Mobility Radeon 7xxx				.*ATI.*Mobility.*Radeon 7.*							0	1	1	1.3
@@ -127,42 +109,66 @@ ATI Mobility Radeon HD 5400				.*ATI.*Mobility.*HD 54.*							2	1	1	4.2
 ATI Mobility Radeon HD 5500				.*ATI.*Mobility.*HD 55.*							3	1	0	4.2
 ATI Mobility Radeon HD 5600				.*ATI.*Mobility.*HD 56.*							3	1	1	4.2
 ATI Mobility Radeon HD 5700				.*ATI.*Mobility.*HD 57.*							3	1	1	4.1
-ATI Mobility Radeon HD 6200				.*ATI.*Mobility.*HD 62.*							3	1	0	0
-ATI Mobility Radeon HD 6300				.*ATI.*Mobility.*HD 63.*							3	1	1	4.2
-ATI Mobility Radeon HD 6400M			.*ATI.*Mobility.*HD 64.*							3	1	0	0
-ATI Mobility Radeon HD 6500M			.*ATI.*Mobility.*HD 65.*							5	1	1	4.2
-ATI Mobility Radeon HD 6600M			.*ATI.*Mobility.*HD 66.*							5	1	0	0
-ATI Mobility Radeon HD 6700M			.*ATI.*Mobility.*HD 67.*							5	1	0	0
-ATI Mobility Radeon HD 6800M			.*ATI.*Mobility.*HD 68.*							5	1	0	0
-ATI Mobility Radeon HD 6900M			.*ATI.*Mobility.*HD 69.*							5	1	0	0
-ATI Mobility Radeon Graphics			.*ATI Mobility Radeon Graphics.*					1	1	0	4
+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
+ATI Radeon HD 6300D/G/M				.*ATI.*AMD Radeon.* (HD|HD )63..[DGM].*				3	1	1	4.2
+ATI Radeon HD 6400D/G/M				.*ATI.*AMD Radeon.* (HD|HD )64..[DGM].*				3	1	0	4.2
+ATI Radeon HD 6500D/G/M				.*ATI.*AMD Radeon.* (HD|HD )65..[DGM].*				4	1	1	4.2
+ATI Radeon HD 6600D/G/M				.*ATI.*AMD Radeon.* (HD|HD )66..[DGM].*				4	1	0	4.2
+ATI Radeon HD 6700D/G/M				.*ATI.*AMD Radeon.* (HD|HD )67..[DGM].*				4	1	0	4.2
+ATI Radeon HD 6800D/G/M				.*ATI.*AMD Radeon.* (HD|HD )68..[DGM].*				4	1	0	4.2
+ATI Radeon HD 6900D/G/M				.*ATI.*AMD Radeon.* (HD|HD )69..[DGM].*				4	1	0	4.2
+ATI Radeon HD 7200D/G/M				.*ATI.*AMD Radeon.* (HD|HD )72..[DGM].*				3	1	0	4.2
+ATI Radeon HD 7300D/G/M				.*ATI.*AMD Radeon.* (HD|HD )73..[DGM].*				3	1	0	4.2
+ATI Radeon HD 7400D/G/M				.*ATI.*AMD Radeon.* (HD|HD )74..[DGM].*				3	1	0	4.2
+ATI Radeon HD 7500D/G/M				.*ATI.*AMD Radeon.* (HD|HD )75..[DGM].*				4	1	0	4.2
+ATI Radeon HD 7600D/G/M				.*ATI.*AMD Radeon.* (HD|HD )76..[DGM].*				4	1	0	4.2
+ATI Radeon HD 7700D/G/M				.*ATI.*AMD Radeon.* (HD|HD )77..[DGM].*				4	1	0	4.2
+ATI Radeon HD 7800D/G/M				.*ATI.*AMD Radeon.* (HD|HD )78..[DGM].*				4	1	0	4.2
+ATI Radeon HD 7900D/G/M				.*ATI.*AMD Radeon.* (HD|HD )79..[DGM].*				4	1	0	4.2
+ATI Radeon HD 8200D/G/M				.*ATI.*AMD Radeon.* (HD|HD )82..[DGM].*				3	1	0	4.2
+ATI Radeon HD 8300D/G/M				.*ATI.*AMD Radeon.* (HD|HD )83..[DGM].*				3	1	0	4.2
+ATI Radeon HD 8400D/G/M				.*ATI.*AMD Radeon.* (HD|HD )84..[DGM].*				4	1	0	4.2
+ATI Radeon HD 8500D/G/M				.*ATI.*AMD Radeon.* (HD|HD )85..[DGM].*				4	1	0	4.2
+ATI Radeon HD 8600D/G/M				.*ATI.*AMD Radeon.* (HD|HD )86..[DGM].*				4	1	0	4.2
+ATI Radeon HD 8700D/G/M				.*ATI.*AMD Radeon.* (HD|HD )87..[DGM].*				4	1	0	4.2
+ATI Radeon HD 8800D/G/M				.*ATI.*AMD Radeon.* (HD|HD )88..[DGM].*				4	1	0	4.2
+ATI Radeon HD 8900D/G/M				.*ATI.*AMD Radeon.* (HD|HD )89..[DGM].*				4	1	0	4.2
 ATI Radeon HD 2300						.*ATI.*Radeon.* (HD|HD )23..						0	1	1	3.3
-ATI Radeon HD 2400						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)24..				1	1	1	4
-ATI Radeon HD 2600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)26..				2	1	1	4
+ATI Radeon HD 2400						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)24..		1	1	1	4
+ATI Radeon HD 2600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)26..		2	1	1	4
 ATI Radeon HD 2900						.*ATI.*Radeon.* (HD|HD )29..						3	1	1	3.3
 ATI Radeon HD 3000						.*ATI.*Radeon.* (HD|HD )30..						0	1	0	0
 ATI Radeon HD 3100						.*ATI.*Radeon.* (HD|HD )31..						1	1	0	0
 ATI Radeon HD 3200						.*ATI.*Radeon.* (HD|HD )32..						1	1	1	4
 ATI Radeon HD 3300						.*ATI.*Radeon.* (HD|HD )33..						1	1	1	3.3
-ATI Radeon HD 3400						.*ATI.*(Radeon|ASUS).* (HD|HD |AH|EAH)34..			1	1	1	4
+ATI Radeon HD 3400						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |AH||AX|EAH)34..		1	1	1	4
 ATI Radeon HD 3500						.*ATI.*Radeon.* (HD|HD )35..						2	1	0	0
-ATI Radeon HD 3600						.*ATI.*(Radeon|ASUS).* (HD|HD |AH|EAH)36..			3	1	1	4
+ATI Radeon HD 3600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |AH||AX|EAH)36..		3	1	1	4
 ATI Radeon HD 3700						.*ATI.*Radeon.* (HD|HD )37..						3	1	0	3.3
 ATI HD3700								.*ATI.* HD37..										3	1	0	3.3
-ATI Radeon HD 3800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)38..				3	1	1	4
+ATI Radeon HD 3800						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH|AX|)38..			3	1	1	4
 ATI Radeon HD 4100						.*ATI.*Radeon.* (HD|HD )41..						1	1	0	0
 ATI Radeon HD 4200						.*ATI.*Radeon.* (HD|HD )42..						1	1	1	4
-ATI Radeon HD 4300						.*ATI.*(Radeon|ASUS).* (HD4|HD 4|EAH4|4)3..			2	1	1	4
+ATI Radeon HD 4300						.*ATI.*(Radeon|ASUS).* (AH|AX|HD4|HD 4|EAH4|4)3..			2	1	1	4
 ATI Radeon HD 4400						.*ATI.*Radeon.* (HD|HD )44..						2	1	0	0
-ATI Radeon HD 4500						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)45..				2	1	1	3.3
-ATI Radeon HD 4600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)46..				3	1	1	4
-ATI Radeon HD 4700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)47..				3	1	1	3.3
-ATI Radeon HD 4800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)48..				3	1	1	4
-ATI Radeon HD 5400						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)54..				3	1	1	4.2
-ATI Radeon HD 5500						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)55..				3	1	1	4.2
-ATI Radeon HD 5600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)56..				3	1	1	4.2
-ATI Radeon HD 5700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)57..				3	1	1	4.2
-ATI Radeon HD 5800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)58..				4	1	1	4.2
+ATI Radeon HD 4500						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)45..		2	1	1	3.3
+ATI RADEON E4690						.*ATI.*RADEON.* E46..								3	1	1	4
+ATI Radeon HD 4600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)46..		3	1	1	4
+ATI Radeon HD 4700						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)47..		3	1	1	3.3
+ATI Radeon HD 4800						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)48..		3	1	1	4
+ATI Radeon HD 5000						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)50..		3	1	1	4.2
+ATI Radeon HD 5400						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)54..		3	1	1	4.2
+ATI Radeon HD 5500						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)55..		3	1	1	4.2
+ATI Radeon HD 5600						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)56..		3	1	1	4.2
+ATI Radeon HD 5700						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)57..		3	1	1	4.2
+ATI Radeon HD 5800						.*ATI.*(Radeon|ASUS).* (AH|AX|HD|HD |EAH)58..		4	1	1	4.2
 ATI Radeon HD 5900						.*ATI.*Radeon.* (HD|HD )59..						4	1	1	4.2
 ATI Radeon HD 6200						.*ATI.*Radeon.* (HD|HD )62..						0	1	1	4.2
 ATI Radeon HD 6300						.*ATI.*Radeon.* (HD|HD )63..						1	1	1	4.2
@@ -172,11 +178,31 @@ ATI Radeon HD 6600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)66..				3	1	1	4.2
 ATI Radeon HD 6700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)67..				3	1	1	4.2
 ATI Radeon HD 6800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)68..				4	1	1	4.2
 ATI Radeon HD 6900						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)69..				5	1	1	4.2
+ATI Radeon HD 6x00						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)6x..				5	1	1	4.2
+ATI Radeon HD 7100						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)71.*					2	1	0	0
+ATI Radeon HD 7200						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)72.*					2	1	0	4.2
+ATI Radeon HD 7300						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)73.*					2	1	0	4.2
+ATI Radeon HD 7400						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)74.*					2	1	0	4.2
+ATI Radeon HD 7500						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)75.*					3	1	1	4.2
+ATI Radeon HD 7600						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)76.*					3	1	0	4.2
+ATI Radeon HD 7700						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)77.*					4	1	1	4.2
+ATI Radeon HD 7800						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)78.*					5	1	1	4.2
+ATI Radeon HD 7900						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)79.*					5	1	1	4.2
+ATI Radeon HD 7000 Series				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)7000 Series.*		3	1	1	4.2
+ATI Radeon HD 8200						.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)82.*					2	1	0	4.2
+ATI Radeon HD 8300 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)83.*					2	1	0	4.2
+ATI Radeon HD 8400 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)84.*					2	1	0	4.2
+ATI Radeon HD 8500 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)85.*					3	1	1	4.2
+ATI Radeon HD 8600 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)86.*					3	1	0	4.2
+ATI Radeon HD 8700 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)87.*					4	1	1	4.2
+ATI Radeon HD 8800 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)88.*					5	1	1	4.2
+ATI Radeon HD 8900 (OEM)				.*ATI.*(Radeon|ASUS).* (HD|HD |EAH)89.*					5	1	1	4.2
 ATI Radeon OpenGL						.*ATI.*Radeon OpenGL.*								0	0	0	0
 ATI Radeon 2100							.*ATI.*Radeon 21..									0	1	1	2.1
 ATI Radeon 3000							.*ATI.*Radeon 30..									1	1	1	4
 ATI Radeon 3100							.*ATI.*Radeon 31..									0	1	1	3.3
 ATI Radeon 5xxx							.*ATI.*Radeon 5...									3	1	0	0
+ATI Radeon 6xxx							.*ATI.*Radeon 6...									0	1	0	0
 ATI Radeon 7xxx							.*ATI.*Radeon 7...									0	1	1	2
 ATI Radeon 8xxx							.*ATI.*Radeon 8...									0	1	0	0
 ATI Radeon 9000							.*ATI.*Radeon 90..									0	1	1	1.3
@@ -186,6 +212,8 @@ ATI Radeon 9500							.*ATI.*Radeon 95..									0	1	1	2.1
 ATI Radeon 9600							.*ATI.*Radeon 96..									0	1	1	2.1
 ATI Radeon 9700							.*ATI.*Radeon 97..									1	1	0	0
 ATI Radeon 9800							.*ATI.*Radeon 98..									1	1	1	2.1
+ATI Radeon R7						.*ATI.*(Radeon|ASUS).* R7.*								4	1	0	4.2
+ATI Radeon R9						.*ATI.*(Radeon|ASUS).* R9.*								5	1	0	4.2
 ATI Radeon RV250						.*ATI.*RV250.*										0	1	0	0
 ATI Radeon RV600						.*ATI.*RV6.*										1	1	0	0
 ATI Radeon RX700						.*ATI.*RX70.*										1	1	0	0
@@ -194,6 +222,7 @@ ATI RS880M								.*ATI.*RS880M										1	1	0	0
 ATI Radeon RX9550						.*ATI.*RX9550.*										1	1	0	0
 ATI Radeon VE							.*ATI.*Radeon.*VE.*									0	0	0	0
 ATI Radeon X300							.*ATI.*Radeon X3.*									1	1	1	2.1
+ATI RADEON X300SE						.*ATI.*RADEON[ ]*X300SE*								1	1	1	2.1
 ATI Radeon X400							.*ATI.*Radeon ?X4.*									0	1	0	0
 ATI Radeon X500							.*ATI.*Radeon ?X5.*									1	1	1	2.1
 ATI Radeon X600							.*ATI.*(Radeon |ASUS Extreme A)X6.*					1	1	1	2.1
@@ -201,10 +230,14 @@ ATI Radeon X700							.*ATI.*Radeon ?X7.*									2	1	1	2.1
 ATI Radeon X800							.*ATI.*Radeon ?X8.*									1	1	1	2.1
 ATI Radeon X900							.*ATI.*Radeon ?X9.*									2	1	0	0
 ATI Radeon X1000						.*ATI.*Radeon ?X10.*								2	1	0	2.1
+ATI Radeon X1100						.*ATI.*Radeon ?X11.*								2	1	0	2.1
 ATI Radeon X1200						.*ATI.*Radeon ?X12.*								2	1	0	2.1
-ATI Radeon X1400						.*ATI.*Radeon ?X14.*								2	1	0	2.1
+ATI Radeon X1xxx						.*ATI.*Radeon ?X1xx.*								2	1	0	2.1
+ATI Radeon X12xx						.*ATI.*Radeon ?X12x.*								2	1	0	2.1
+ATI Radeon X2xxx						.*ATI.*Radeon ?X2x.*								2	1	0	2.1
 ATI Radeon X2300						.*ATI.*Radeon ?X23.*								2	1	0	2.1
 ATI Radeon Xpress						.*ATI.*Radeon Xpress.*								0	1	1	2.1
+ATI Radeon								.*ATI.*Radeon$										3	1	0	0
 ATI Rage 128							.*ATI.*Rage 128.*									0	1	0	0
 ATI R300 (9700)							.*R300.*											0	1	1	2.1
 ATI R350 (9800)							.*R350.*											1	1	0	0
@@ -223,7 +256,9 @@ ATI RX480 (Xpress 200P)					.*RX480.*											0	1	0	0
 ATI RX700								.*RX700.*											1	1	0	0
 AMD ANTILLES (HD 6990)					.*(AMD|ATI).*Antilles.*								3	1	0	0
 ATI ROBSON								.*(AMD|ATI).*ROBSON.*								3	1	0	4
+AMD ARUBA (HD 6800)						.*(AMD|ATI).*ARUBA.*								3	1	1	2.1
 AMD BARTS (HD 6800)						.*(AMD|ATI).*Barts.*								3	1	1	2.1
+AMD BA (HD 6800)						.*(AMD|ATI).*BA.*									3	1	1	2.1
 AMD WRESTLER							.*(AMD|ATI).*WRESTLER.*								3	1	1	4
 AMD SUMO								.*(AMD|ATI).*SUMO.*									3	1	1	4.1
 AMD CAICOS (HD 6400)					.*(AMD|ATI).*Caicos.*								3	1	0	0
@@ -235,6 +270,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
@@ -252,15 +289,15 @@ AMD RV790 (HD 4800)						.*RV790.*											3	1	0	0
 ATI 760G/Radeon 3000					.*ATI.*AMD 760G.*									1	1	1	3.3
 ATI 780L/Radeon 3000					.*ATI.*AMD 780L.*									1	1	0	0
 ATI Radeon DDR							.*ATI.*Radeon ?DDR.*								0	1	0	0
-ATI FirePro 2000						.*ATI.*FirePro 2.*									2	1	1	4.2
-ATI FirePro 3000						.*ATI.*FirePro V3.*									2	1	0	0
-ATI FirePro 4000						.*ATI.*FirePro V4.*									2	1	0	4.1
-ATI FirePro 5000						.*ATI.*FirePro V5.*									3	1	0	0
-ATI FirePro 7000						.*ATI.*FirePro V7.*									3	1	0	0
+ATI FirePro 2000						.*ATI.*FirePro [V]*2.*									2	1	1	4.2
+ATI FirePro 3000						.*ATI.*FirePro [V]*3.*									2	1	0	0
+ATI FirePro 4000						.*ATI.*FirePro [V]*4.*									2	1	0	4.1
+ATI FirePro 5000						.*ATI.*FirePro [V]*5.*									3	1	0	0
+ATI FirePro 7000						.*ATI.*FirePro [V]*7.*									3	1	0	0
 ATI FirePro M							.*ATI.*FirePro M.*									3	1	1	4.2
-ATI R300 (9700)							.*R300.*											0	1	1	2.1
 Intel X3100								.*Intel.*X3100.*									1	1	1	2.1
 Intel GMA 3600							.*Intel.* 3600.*									0	1	1	3
+Intel Royal BNA							.*Intel.*Royal[ ]*BNA.*								0	0	0	0
 Intel 830M								.*Intel.*830M										0	0	0	0
 Intel 845G								.*Intel.*845G										0	0	1	1.4
 Intel 855GM								.*Intel.*855GM										0	0	1	1.4
@@ -281,11 +318,20 @@ Intel Brookdale							.*Intel.*Brookdale.*								0	0	1	1.3
 Intel Cantiga							.*Intel.*Cantiga.*									0	0	1	2
 Intel Eaglelake							.*Intel.*Eaglelake.*								1	1	1	2
 Intel Graphics Media HD					.*Intel.*Graphics Media.*HD.*						1	1	1	2.1
-Intel HD Graphics 2000					.*Intel.*HD Graphics 2.*							2	1	0	4
+Intel HD Graphics 2500					.*Intel.*HD Graphics 25.*							2	1	0	4.2
+Intel HD Graphics 2000					.*Intel.*HD Graphics 2.*							2	1	0	3.1
 Intel HD Graphics 3000					.*Intel.*HD Graphics 3.*							3	1	1	3.1
-Intel HD Graphics 4000					.*Intel.*HD Graphics 4.*							3	1	1	4
+Intel HD Graphics 4200					.*Intel.*HD Graphics 42.*							3	1	0	4.2
+Intel HD Graphics 4400					.*Intel.*HD Graphics 44.*							3	1	0	4.2
+Intel HD Graphics 4600					.*Intel.*HD Graphics 46.*							3	1	0	4.2
+Intel HD Graphics 4000					.*Intel.*HD Graphics 4.*							3	1	1	4.2
+Intel Intel Iris Pro Graphics 5200		.*Intel.*Iris Pro Graphics 52.*						4	1	0	4
+Intel Intel Iris Graphics 5100			.*Intel.*Iris Graphics 51.*							4	1	0	4
+Intel Intel Iris OpenGL Engine			.*Intel.*Iris (Pro )*OpenGL.*							4	1	0	4
+Intel HD Graphics 5000					.*Intel.*HD Graphics 5.*							4	1	0	4
 Intel HD Graphics						.*Intel.*HD Graphics.*								2	1	1	4
 Intel Mobile 4 Series					.*Intel.*Mobile.* 4 Series.*						0	1	1	2.1
+Intel Mobile 45 Express					.*Intel.*Mobile.* 45 Express Chipset.*				0	1	0	2.1
 Intel 4 Series Internal					.*Intel.* 4 Series Internal.*						1	1	1	2.1
 Intel Media Graphics HD					.*Intel.*Media Graphics HD.*						0	1	0	0
 Intel Montara							.*Intel.*Montara.*									0	0	1	1.3
@@ -298,116 +344,197 @@ Intel 3D-Analyze						.*Intel.*3D-Analyze.*								2	1	0	0
 Matrox									.*Matrox.*											0	0	0	0
 Mesa									.*Mesa.*											1	0	1	3
 Gallium									.*Gallium.*											1	1	1	2.1
-NVIDIA G100M							.*NVIDIA .* 10[0-9]M.*								4	1	1	3.3
-NVIDIA G 110M							.*NVIDIA .* 11[0-9]M.*								1	1	1	3.3
-NVIDIA G 120M							.*NVIDIA .* 12[0-9]M.*								1	1	1	3.3
-NVIDIA G 200M							.*NVIDIA .* 20[0-9]M.*								1	1	0	0
-NVIDIA G 410M							.*NVIDIA .* 41[0-9]M.*								3	1	1	4.2
-NVIDIA GT 130M							.*NVIDIA .*GT 13[0-9]M.*							3	1	1	3.3
-NVIDIA GT 140M							.*NVIDIA .*GT 14[0-9]M.*							3	1	1	3.3
-NVIDIA GT 150M							.*NVIDIA .*GTS 15[0-9]M.*							2	1	0	0
-NVIDIA GTS 160M							.*NVIDIA .*GTS 16[0-9]M.*							2	1	0	0
-NVIDIA G210M							.*NVIDIA .*G21[0-9]M.*								3	1	0	3.3
+NVIDIA GeForce Pre-Release				.*NVIDIA .*GeForce[ ]Pre-Release.*					2	1	1	3.3
+NVIDIA D1xP1							.*NVIDIA .*D1[0-4]P1.*								0	0	0	0
+NVIDIA Mystery PCI Card					.*NVIDIA .Corporation [/]PCI]/]SSE2.*				0	0	0	0
+NVIDIA Quadro FX 770M					.*Quadro.*FX 77[0-9]M.*								2	1	0	3.3
+NVIDIA Quadro FX 1500M					.*Quadro.*FX 150[0-9]M.*							1	1	0	2.1
+NVIDIA Quadro FX 1600M					.*Quadro.*FX 160[0-9]M.*							2	1	0	3.3
+NVIDIA Quadro FX 2500M					.*Quadro.*FX 250[0-9]M.*							2	1	0	2.1
+NVIDIA Quadro FX 2700M					.*Quadro.*FX 270[0-9]M.*							3	1	0	3.3
+NVIDIA Quadro FX 2800M					.*Quadro.*FX 280[0-9]M.*							3	1	0	3.3
+NVIDIA Quadro FX 3500					.*Quadro.*FX 3500.*									2	1	0	2.1
+NVIDIA Quadro FX 3600					.*Quadro.*FX 3600.*									3	1	0	3.3
+NVIDIA Quadro FX 3700					.*Quadro.*FX 3700.*									3	1	0	3.3
+NVIDIA Quadro FX 3800					.*Quadro.*FX 3800.*									3	1	0	3.3
+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 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 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 K600						.*Quadro.* (K6|6)0[0-9][^0].*							2	1	0	4.2
+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.* (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
+NVIDIA Quadro 600						.*Quadro.* 600.*									2	1	0	4.2
+NVIDIA Quadro4							.*Quadro4.*											0	1	0	1.5
+NVIDIA Quadro DCC						.*Quadro DCC.*										0	1	0	0
+NVIDIA Quadro CX						.*Quadro.*CX.*										3	1	0	0
+NVIDIA G 100M							.*NVIDIA .*G *10[0-9]M.*								1	1	1	3.3
+NVIDIA G 110M							.*NVIDIA .*G *11[0-9]M.*								1	1	1	3.3
+NVIDIA G 120M							.*NVIDIA .*G *12[0-9]M.*								1	1	1	3.3
+NVIDIA G 200M							.*NVIDIA .*G *20[0-9]M.*								1	1	0	0
+NVIDIA G 410M							.*NVIDIA .*G *41[0-9]M.*								3	1	1	4.2
+NVIDIA GT 130M							.*NVIDIA .*GT *13[0-9]M.*							3	1	1	3.3
+NVIDIA GT 140M							.*NVIDIA .*GT *14[0-9]M.*							3	1	1	3.3
+NVIDIA GT 150M							.*NVIDIA .*GTS *15[0-9]M.*							2	1	0	0
+NVIDIA GTS 160M							.*NVIDIA .*GTS *16[0-9]M.*							2	1	0	0
+NVIDIA G210M							.*NVIDIA .*G *21[0-9]M.*							3	1	0	3.3
 NVIDIA GT 220M							.*NVIDIA .*GT 22[0-9]M.*							3	1	1	3.3
 NVIDIA GT 230M							.*NVIDIA .*GT 23[0-9]M.*							3	1	1	3.3
 NVIDIA GT 240M							.*NVIDIA .*GT 24[0-9]M.*							3	1	1	3.3
+NVIDIA GT 260M							.*NVIDIA .*GT 26[0-9]M.*							3	1	1	3.3
 NVIDIA GTS 250M							.*NVIDIA .*GTS 25[0-9]M.*							3	1	0	3.3
 NVIDIA GTS 260M							.*NVIDIA .*GTS 26[0-9]M.*							3	1	0	0
 NVIDIA GTX 260M							.*NVIDIA .*GTX 26[0-9]M.*							3	1	0	3.3
 NVIDIA GTX 270M							.*NVIDIA .*GTX 27[0-9]M.*							3	1	0	0
 NVIDIA GTX 280M							.*NVIDIA .*GTX 28[0-9]M.*							3	1	0	3.3
 NVIDIA 300M								.*NVIDIA .*GT 30[0-9]M.*							3	1	1	4.2
-NVIDIA G 310M							.*NVIDIA .* 31[0-9]M.*								2	1	0	3.3
-NVIDIA GT 320M							.*NVIDIA .* 32[0-9]M.*								3	1	0	3.3
-NVIDIA GT 330M							.*NVIDIA .*GT 33[0-9]M.*							3	1	1	3.3
-NVIDIA GT 340M							.*NVIDIA .*GT 34[0-9]M.*							4	1	1	3.3
+NVIDIA G 310M							.*NVIDIA .*G[T]* 31[0-9]M.*								2	1	0	3.3
+NVIDIA GT 320M							.*NVIDIA .*G[T]* 32[0-9]M.*								3	1	0	3.3
+NVIDIA GT 330M							.*NVIDIA .*G[T]* 33[0-9]M.*							3	1	1	3.3
+NVIDIA GT 340M							.*NVIDIA .*G[T]* 34[0-9]M.*							4	1	1	3.3
 NVIDIA GTS 350M							.*NVIDIA .*GTS 35[0-9]M.*							4	1	1	3.3
 NVIDIA GTS 360M							.*NVIDIA .*GTS 36[0-9]M.*							5	1	1	3.3
-NVIDIA 400M								.*NVIDIA .* 40[0-9]M.*								2	1	0	0
-NVIDIA 410M								.*NVIDIA .* 41[0-9]M.*								3	1	0	0
-NVIDIA GT 420M							.*NVIDIA .*GT 42[0-9]M.*							3	1	1	4.2
-NVIDIA GT 430M							.*NVIDIA .*GT 43[0-9]M.*							3	1	1	4.2
-NVIDIA GT 440M							.*NVIDIA .*GT 44[0-9]M.*							3	1	1	4.2
-NVIDIA GT 450M							.*NVIDIA .*GT 45[0-9]M.*							3	1	0	0
-NVIDIA GTX 460M							.*NVIDIA .*GTX 46[0-9]M.*							4	1	1	4.3
-NVIDIA GTX 470M							.*NVIDIA .*GTX 47[0-9]M.*							3	1	0	4.2
-NVIDIA GTX 480M							.*NVIDIA .*GTX 48[0-9]M.*							3	1	1	4.2
-NVIDIA GT 520M							.*NVIDIA .*GT 52[0-9]M.*							3	1	1	4.2
-NVIDIA GT 530M							.*NVIDIA .*GT 53[0-9]M.*							3	1	1	4.2
-NVIDIA GT 540M							.*NVIDIA .*GT 54[0-9]M.*							3	1	1	4.2
-NVIDIA GT 550M							.*GeForce GT 55[0-9]M.*								3	1	1	4.2
-NVIDIA GTX 560M							.*NVIDIA .*GTX 56[0-9]M.*							3	1	0	4.2
-NVIDIA GTX 570M							.*NVIDIA .*GTX 57[0-9]M.*							5	1	0	4.2
-NVIDIA GTX 580M							.*NVIDIA .*GTX 58[0-9]M.*							5	1	1	4.2
-NVIDIA 610M								.*NVIDIA.* 61[0-9]M.*								3	1	1	4.2
-NVIDIA GT 620M							.*NVIDIA .*GT 62[0-9]M.*							3	1	0	4.2
-NVIDIA GT 630M							.*NVIDIA .*GT 63[0-9]M.*							3	1	0	4.2
-NVIDIA GT 640M							.*NVIDIA .*GT 64[0-9]M.*							3	1	0	4.2
-NVIDIA GT 650M							.*NVIDIA .*GT 65[0-9]M.*							3	1	0	4.2
-NVIDIA GTX 660M							.*NVIDIA .*GTX 66[0-9]M.*							5	1	0	4.3
-NVIDIA GTX 670M							.*NVIDIA .*GTX 67[0-9]M.*							5	1	1	4.2
-NVIDIA GTX 680M							.*NVIDIA .*GTX 68[0-9]M.*							5	1	0	4.2
-NVIDIA GTX 690M							.*NVIDIA .*GTX 69[0-9]M.*							5	1	0	0
+NVIDIA 310M								.*NVIDIA .*31[0-9]M.*								2	1	0	3.3
+NVIDIA 320M								.*NVIDIA .*320M.*									2	1	0	3.3
+NVIDIA 400M								.*NVIDIA .*[ ]+40[0-9]M.*								2	1	0	0
+NVIDIA 410M								.*NVIDIA .*[ ]+41[0-9]M.*								3	1	0	0
+NVIDIA GT 420M							.*NVIDIA .*GT *42[0-9]M.*							3	1	1	4.3
+NVIDIA GT 430M							.*NVIDIA .*GT *43[0-9]M.*							3	1	1	4.3
+NVIDIA GT 440M							.*NVIDIA .*GT *44[0-9]M.*							3	1	1	4.3
+NVIDIA GT 450M							.*NVIDIA .*GT *45[0-9]M.*							3	1	0	0
+NVIDIA GTX 460M							.*NVIDIA .*GTX *46[0-9]M.*							4	1	1	4.3
+NVIDIA GTX 470M							.*NVIDIA .*GTX *47[0-9]M.*							3	1	0	4.3
+NVIDIA GTX 480M							.*NVIDIA .*GTX *48[0-9]M.*							3	1	1	4.3
+NVIDIA GT 520M							.*NVIDIA .*GT *52[0-9]M.*							3	1	1	4.3
+NVIDIA GT 530M							.*NVIDIA .*GT *53[0-9]M.*							3	1	1	4.3
+NVIDIA GT 540M							.*NVIDIA .*GT *54[0-9]M.*							3	1	1	4.3
+NVIDIA GT 550M							.*NVIDIA .*GT *55[0-9]M.*							3	1	1	4.3
+NVIDIA GTX 560M							.*NVIDIA .*GTX *56[0-9]M.*							3	1	0	4.3
+NVIDIA GTX 570M							.*NVIDIA .*GTX *57[0-9]M.*							5	1	0	4.3
+NVIDIA GTX 580M							.*NVIDIA .*GTX *58[0-9]M.*							5	1	1	4.3
+NVIDIA 610M								.*NVIDIA.* 61[0-9]M.*								3	1	1	4.3
+NVIDIA GT 620M							.*NVIDIA .*GT *62[0-9]M.*							3	1	0	4.3
+NVIDIA GT 630M							.*NVIDIA .*GT *63[0-9]M.*							3	1	0	4.3
+NVIDIA GT 640M							.*NVIDIA .*GT *64[0-9]M.*							3	1	0	4.3
+NVIDIA GT 650M							.*NVIDIA .*GT *65[0-9]M.*							3	1	0	4.3
+NVIDIA GTX 660M							.*NVIDIA .*GTX *66[0-9]M.*							5	1	0	4.3
+NVIDIA GTX 670M							.*NVIDIA .*GTX *67[0-9]M.*							5	1	1	4.3
+NVIDIA GTX 680M							.*NVIDIA .*GTX *68[0-9]M.*							5	1	0	4.3
+NVIDIA GTX 690M							.*NVIDIA .*GTX *69[0-9]M.*							5	1	0	4.3
+NVIDIA 710M								.*NVIDIA.* 71[0-9]M.*								3	1	0	4.3
+NVIDIA GT 720M							.*NVIDIA .*GT *72[0-9]M.*							3	1	0	4.3
+NVIDIA GT 730M							.*NVIDIA .*GT *73[0-9]M.*							3	1	0	4.3
+NVIDIA GT 740M							.*NVIDIA .*GT *74[0-9]M.*							3	1	0	4.3
+NVIDIA GT 750M							.*NVIDIA .*GT *75[0-9]M.*							3	1	0	4.3
+NVIDIA GTX 760M							.*NVIDIA .*GTX *76[0-9]M.*							5	1	0	4.3
+NVIDIA GTX 770M							.*NVIDIA .*GTX *77[0-9]M.*							5	1	0	4.3
+NVIDIA GTX 780M							.*NVIDIA .*GTX *78[0-9]M.*							5	1	0	4.3
 NVIDIA G100								.*NVIDIA .*G10.*									3	1	1	4.2
 NVIDIA GT 120							.*NVIDIA .*GT 12.*									2	1	0	3.3
 NVIDIA GT 130							.*NVIDIA .*GT 13.*									2	1	0	3.3
 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 .*GeForce 20.*								2	1	1	3.3
-NVIDIA G200								.*NVIDIA .*GeForce G20.*							2	1	1	3.3
-NVIDIA G210								.*NVIDIA .*GeForce G210.*							3	1	1	3.3
-NVIDIA 210								.*NVIDIA .*GeForce 210.*							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
-NVIDIA GTS 240							.*NVIDIA .*GTS 24.*									4	1	1	3.3
-NVIDIA GTS 250							.*NVIDIA .*GTS 25.*									4	1	1	3.3
-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 .*GeForce 310.*							3	1	1	3.3
-NVIDIA 315								.*NVIDIA .*GeForce 315.*							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	3.3
-NVIDIA 405								.*NVIDIA .* 405.*									3	1	0	3.3
-NVIDIA GT 420							.*NVIDIA .*GT 42.*									3	1	1	4.2
-NVIDIA GT 430							.*NVIDIA .*GT 43.*									3	1	1	4.3
-NVIDIA GT 440							.*NVIDIA .*GT 44.*									4	1	0	4.3
-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 510								.*NVIDIA .* 510.*									3	1	0	4.2
-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
-NVIDIA GTX 550							.*NVIDIA .*GTX 55.*									5	1	1	4.3
-NVIDIA GTX 560							.*NVIDIA .*GTX 56.*									5	1	1	4.3
-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 GT 610							.*NVIDIA .*GT 61.*									3	1	1	4.2
-NVIDIA GT 620							.*NVIDIA .*GT 62.*									3	1	0	4.2
-NVIDIA GT 630							.*NVIDIA .*GT 63.*									3	1	0	4.2
-NVIDIA GT 640							.*NVIDIA .*GT 64.*									3	1	0	4.2
-NVIDIA GT 650							.*NVIDIA .*GT 65.*									3	1	1	4.2
-NVIDIA GTX 650							.*NVIDIA .*GTX 65.*									3	1	1	4.2
-NVIDIA GTX 660							.*NVIDIA .*GTX 66.*									5	1	0	4.3
-NVIDIA GTX 670							.*NVIDIA .*GTX 67.*									5	1	1	4.2
-NVIDIA GTX 680							.*NVIDIA .*GTX 68.*									5	1	1	4.2
-NVIDIA GTX 690							.*NVIDIA .*GTX 69.*									5	1	1	4.2
+NVIDIA 200								.*NVIDIA .[ ]+200[^0].*								2	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$							3	1	1	3.3
+NVIDIA GeForce 210						.*NVIDIA .*(GeForce)[ ]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
+NVIDIA GTS 240							.*NVIDIA .*GTS *24.*									4	1	1	3.3
+NVIDIA GTS 250							.*NVIDIA .*GTS *25.*									4	1	1	3.3
+NVIDIA GTS 360							.*NVIDIA .*GTS *36.*									4	1	1	3.3
+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 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 310								.*NVIDIA .*310[^0M]*.*							3	1	1	3.3
+NVIDIA 315								.*NVIDIA .*315[^0M]*.*							3	1	1	3.3
+NVIDIA 320								.*NVIDIA .*320[^0M]*.*							3	1	1	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.3
+NVIDIA GT 420							.*NVIDIA .*GT *42.*									3	1	1	4.3
+NVIDIA GT 430							.*NVIDIA .*GT *43.*									3	1	1	4.3
+NVIDIA GT 440							.*NVIDIA .*GT *44.*									4	1	1	4.3
+NVIDIA GT 450							.*NVIDIA .*GT *45.*									4	1	1	4.3
+NVIDIA GTS 450							.*NVIDIA .*GTS *45.*									4	1	1	4.3
+NVIDIA GTX 460							.*NVIDIA .*GTX *46.*					5	1	1	4.3
+NVIDIA GTX 470							.*NVIDIA .*GTX *47.*									5	1	1	4.3
+NVIDIA GTX 480							.*NVIDIA .*GTX *48.*									5	1	1	4.3
+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.3
+NVIDIA GT 530							.*NVIDIA .*GT *53.*									3	1	1	4.3
+NVIDIA GT 540							.*NVIDIA .*GT *54.*									3	1	1	4.3
+NVIDIA GT 550							.*NVIDIA .*GT *55.*									3	1	1	4.3
+NVIDIA GTX 550							.*NVIDIA .*GTX *55.*					5	1	1	4.3
+NVIDIA GTX 560							.*NVIDIA .*GTX *56.*									5	1	1	4.3
+NVIDIA GTX 570							.*NVIDIA .*GTX *57.*									5	1	1	4.3
+NVIDIA GTX 580							.*NVIDIA .*GTX *58.*					5	1	1	4.3
+NVIDIA GTX 590							.*NVIDIA .*GTX *59.*									5	1	1	4.3
+NVIDIA 605								.*NVIDIA .*605[^0]*.*									3	1	1	4.3
+NVIDIA GT 61x							.*NVIDIA .*GT 61.*									3	1	1	4.3
+NVIDIA GT 62x							.*NVIDIA .*GT 62.*									3	1	0	4.3
+NVIDIA GT 63x							.*NVIDIA .*GT 63.*									3	1	0	4.3
+NVIDIA GT 64x							.*NVIDIA .*GT 64.*									3	1	0	4.3
+NVIDIA GT 65x							.*NVIDIA .*GT 65.*									3	1	1	4.3
+NVIDIA GTX 64x							.*NVIDIA .*GTX 64.*									3	1	1	4.3
+NVIDIA GTX 65x							.*NVIDIA .*GTX 65.*									3	1	1	4.3
+NVIDIA GTX 66x							.*NVIDIA .*GTX 66.*									5	1	0	4.3
+NVIDIA GTX 67x							.*NVIDIA .*GTX 67.*									5	1	1	4.3
+NVIDIA GTX 68x							.*NVIDIA .*GTX 68.*									5	1	1	4.3
+NVIDIA GTX 69x							.*NVIDIA .*GTX 69.*									5	1	1	4.3
+NVIDIA GT 71x							.*NVIDIA .*GT *71.*									3	1	0	4.3
+NVIDIA GT 72x							.*NVIDIA .*GT *72.*									3	1	0	4.3
+NVIDIA GT 73x							.*NVIDIA .*GT *73.*									3	1	0	4.3
+NVIDIA GT 74x							.*NVIDIA .*GT *74.*									3	1	0	4.3
+NVIDIA GTX 75x							.*NVIDIA .*GTX *75.*								3	1	0	4.3
+NVIDIA GTX 76x							.*NVIDIA .*GTX *76.*								5	1	0	4.3
+NVIDIA GTX 77x							.*NVIDIA .*GTX *77.*								5	1	0	4.3
+NVIDIA GTX 78x							.*NVIDIA .*GTX *78.*								5	1	0	4.3
+NVIDIA GTX TITAN						.*NVIDIA .*GTX *TITAN.*								5	1	0	4.3
 NVIDIA C51								.*NVIDIA .*C51.*									0	1	1	2
 NVIDIA G72								.*NVIDIA .*G72.*									1	1	0	0
 NVIDIA G73								.*NVIDIA .*G73.*									1	1	0	0
 NVIDIA G84								.*NVIDIA .*G84.*									2	1	0	0
 NVIDIA G86								.*NVIDIA .*G86.*									3	1	0	0
 NVIDIA G92								.*NVIDIA .*G92.*									3	1	0	0
+NVIDIA GK106							.*NVIDIA .*GK106.*									5	1	0	4.3
 NVIDIA GeForce							.*GeForce 256.*										0	0	0	0
 NVIDIA GeForce 2						.*GeForce ?2 ?.*									0	1	1	1.5
+NVIDIA GeForce 3						.*GeForce ?3 ?.*						2	1	1	2.1
+NVIDIA GeForce 3 Ti						.*GeForce ?3 Ti.*						0	1	0	0
 NVIDIA GeForce 4						.*NVIDIA .*GeForce ?4.*								0	1	1	1.5
+NVIDIA GeForce 4 Go						.*NVIDIA .*GeForce ?4.*Go.*				0	1	0	0
+NVIDIA GeForce 4 MX						.*NVIDIA .*GeForce ?4 MX.*				0	1	0	0
+NVIDIA GeForce 4 PCX					.*NVIDIA .*GeForce ?4 PCX.*				0	1	0	0
+NVIDIA GeForce 4 Ti						.*NVIDIA .*GeForce ?4 Ti.*				0	1	0	0
 NVIDIA GeForce 6100						.*NVIDIA .*GeForce 61.*								3	1	1	4.2
 NVIDIA GeForce 6200						.*NVIDIA .*GeForce 62.*								0	1	1	2.1
 NVIDIA GeForce 6500						.*NVIDIA .*GeForce 65.*								1	1	1	2.1
@@ -485,8 +612,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 .*ION 2.*									2	1	0	0
-NVIDIA ION 								.*NVIDIA Corporation.*ION.*							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
@@ -494,7 +619,9 @@ NVIDIA NB9M								.*NVIDIA .*NB9M.*									1	1	0	0
 NVIDIA NB9P								.*NVIDIA .*NB9P.*									2	1	0	0
 NVIDIA N10								.*NVIDIA .*N10.*									1	1	0	2.1
 NVIDIA GeForce PCX						.*GeForce PCX.*										0	1	0	1.5
-NVIDIA Generic							.*NVIDIA .*Unknown.*								0	0	0	2.1
+NVIDIA PCI								.*NVIDIA PCI[ ]*								0	0	0	2.1
+NVIDIA Generic							.*NVIDIA Generic.*								0	0	0	2.1
+NVIDIA Generic Unknown					.*NVIDIA .*Unknown.*								0	0	0	2.1
 NVIDIA NV17								.*NVIDIA .*NV17.*									0	1	0	0
 NVIDIA NV34								.*NVIDIA .*NV34.*									0	1	0	0
 NVIDIA NV35								.*NVIDIA .*NV35.*									0	1	0	0
@@ -512,45 +639,14 @@ NVIDIA MCP77							.*NVIDIA .*MCP77.*									1	1	0	0
 NVIDIA MCP78							.*NVIDIA .*MCP78.*									1	1	0	0
 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 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 50x0 M					.*Quadro.* 50.0.*									3	1	0	4.2
-NVIDIA Quadro 6000						.*Quadro.* 6000.*									3	1	0	0
-NVIDIA Quadro 400						.*Quadro.* 400.*									2	1	0	3.3
-NVIDIA Quadro 600						.*Quadro.* 600.*									2	1	0	4.2
-NVIDIA Quadro4							.*Quadro4.*											0	1	0	1.5
-NVIDIA Quadro DCC						.*Quadro DCC.*										0	1	0	0
-NVIDIA Quadro CX						.*Quadro.*CX.*										3	1	0	0
-NVIDIA Quadro FX 770M					.*Quadro.*FX 77[0-9]M.*								2	1	0	3.3
-NVIDIA Quadro FX 1500M					.*Quadro.*FX 150[0-9]M.*							1	1	0	2.1
-NVIDIA Quadro FX 1600M					.*Quadro.*FX 160[0-9]M.*							2	1	0	3.3
-NVIDIA Quadro FX 2500M					.*Quadro.*FX 250[0-9]M.*							2	1	0	2.1
-NVIDIA Quadro FX 2700M					.*Quadro.*FX 270[0-9]M.*							3	1	0	3.3
-NVIDIA Quadro FX 2800M					.*Quadro.*FX 280[0-9]M.*							3	1	0	3.3
-NVIDIA Quadro FX 3500					.*Quadro.*FX 3500.*									2	1	0	2.1
-NVIDIA Quadro FX 3600					.*Quadro.*FX 3600.*									3	1	0	3.3
-NVIDIA Quadro FX 3700					.*Quadro.*FX 3700.*									3	1	0	3.3
-NVIDIA Quadro FX 3800					.*Quadro.*FX 3800.*									3	1	0	3.3
-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						.*Quadro FX.*										1	1	0	3.3
-NVIDIA Quadro NVS 1xxM					.*Quadro NVS 1.[05]M.*								0	1	1	3.3
-NVIDIA Quadro NVS 300M					.*NVIDIA .*NVS 30[0-9]M.*							2	1	0	0
-NVIDIA Quadro NVS 320M					.*NVIDIA .*NVS 32[0-9]M.*							2	1	0	0
-NVIDIA Quadro NVS 2100M					.*NVIDIA .*NVS 210[0-9]M.*							2	1	0	3.3
-NVIDIA Quadro NVS 3100M					.*NVIDIA .*NVS 310[0-9]M.*							2	1	0	3.3
-NVIDIA Quadro NVS 4200M					.*NVIDIA .*NVS 420[0-9]M.*							2	1	0	4.2
-NVIDIA Quadro NVS 5100M					.*NVIDIA .*NVS 510[0-9]M.*							2	1	0	0
-NVIDIA Quadro NVS						.*NVIDIA .*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
-S3										.*S3 Graphics.*										0	0	1	1.4
+NVIDIA GRID								.*NVIDIA .*GRID.*									0	0	0	1.5
+NVIDIA ION 2							.*NVIDIA .* *[I][O][N] 2.*							2	1	0	0
+NVIDIA ION a							.*NVIDIA .*[I][O][N]$							2	1	1	3.3
+NVIDIA ION b							.*NVIDIA .*(Corporation) [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
 Tungsten Graphics						Tungsten.*											0	0	0	0
@@ -558,5 +654,9 @@ XGI										XGI.*												0	0	0	0
 VIA										VIA.*												0	0	0	0
 Apple Generic							Apple.*Generic.*									0	0	0	0
 Apple Software Renderer					Apple.*Software Renderer.*							0	0	0	0
+Oracle									VirtualBox.*										0	1	1	2.1
 Humper									Humper.*											0	1	1	2.1
 PowerVR SGX545							.*PowerVR SGX.*										1	1	1	3
+ATI GeForce Lulz						.*ATI.*GeForce.*									0	0	0	0
+
+