From 81d54f08b07f4c0853e914536ef643661713cc65 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 25 Mar 2011 10:34:33 +0100 Subject: cleaned up particle system llsd de/serialization; improvements to the avatar cloud * llsd now uses camel case for each key, confusion of particle max age vs source max age fixed * cloud.xml is now loaded with a fallback chain PER_SL_ACCOUNT -> USER_SETTINGS -> APP_SETTINGS so that customized clouds can exist per account or for all users and survive updates --- linden/indra/llmessage/llpartdata.cpp | 28 ++++---- linden/indra/newview/app_settings/cloud.xml | 100 +++++++++++++++++----------- linden/indra/newview/llvoavatar.cpp | 10 ++- 3 files changed, 83 insertions(+), 55 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp index a2811ab..4012d2c 100644 --- a/linden/indra/llmessage/llpartdata.cpp +++ b/linden/indra/llmessage/llpartdata.cpp @@ -363,14 +363,14 @@ LLSD LLPartSysData::asLLSD() const sd["LL_PART_EMISSIVE_MASK"] = (LLPartData::LL_PART_EMISSIVE_MASK & mPartData.mFlags) ? 1 : 0; sd["LL_PART_BEAM_MASK"] = (LLPartData::LL_PART_BEAM_MASK & mPartData.mFlags) ? 1 : 0; - sd["SourceMaxage"] = mPartData.mMaxAge; - sd["Startcolor"] = ll_sd_from_color4(mPartData.mStartColor); - sd["Endcolor"] = ll_sd_from_color4(mPartData.mEndColor); - sd["Startscale"] = ll_sd_from_vector2(mPartData.mStartScale); - sd["Endscale"] = ll_sd_from_vector2(mPartData.mEndScale); + sd["ParticleMaxAge"] = mPartData.mMaxAge; + sd["StartColor"] = ll_sd_from_color4(mPartData.mStartColor); + sd["EndColor"] = ll_sd_from_color4(mPartData.mEndColor); + sd["StartScale"] = ll_sd_from_vector2(mPartData.mStartScale); + sd["EndScale"] = ll_sd_from_vector2(mPartData.mEndScale); - sd["ParticleMaxAge"] = mMaxAge; - sd["ParticleStartAge"] = mStartAge; + sd["SourceMaxAge"] = mMaxAge; + sd["SourceStartAge"] = mStartAge; sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0; @@ -406,14 +406,14 @@ bool LLPartSysData::fromLLSD(LLSD& sd) if (sd["LL_PART_EMISSIVE_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK; if (sd["LL_PART_BEAM_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK; - mPartData.mMaxAge = (F32)sd["SourceMaxage"].asReal(); - mPartData.mStartColor = ll_color4_from_sd(sd["Startcolor"]); - mPartData.mEndColor = ll_color4_from_sd(sd["Endcolor"]); - mPartData.mStartScale = ll_vector2_from_sd(sd["Startscale"]); - mPartData.mEndScale = ll_vector2_from_sd(sd["Endscale"]); + mPartData.mMaxAge = (F32)sd["ParticleMaxAge"].asReal(); + mPartData.mStartColor = ll_color4_from_sd(sd["StartColor"]); + mPartData.mEndColor = ll_color4_from_sd(sd["EndColor"]); + mPartData.mStartScale = ll_vector2_from_sd(sd["StartScale"]); + mPartData.mEndScale = ll_vector2_from_sd(sd["EndScale"]); - mMaxAge = (F32)sd["ParticleMaxAge"].asReal(); - mStartAge = (F32)sd["ParticleStartAge"].asReal(); + mMaxAge = (F32)sd["SourceMaxAge"].asReal(); + mStartAge = (F32)sd["SourceStartAge"].asReal(); mPattern = 0; if (sd["LL_PART_SRC_PATTERN_DROP"]) mPattern |= LL_PART_SRC_PATTERN_DROP; diff --git a/linden/indra/newview/app_settings/cloud.xml b/linden/indra/newview/app_settings/cloud.xml index ff9492b..e62bcf1 100644 --- a/linden/indra/newview/app_settings/cloud.xml +++ b/linden/indra/newview/app_settings/cloud.xml @@ -1,33 +1,87 @@ + + + + + SourceMaxAge + 0 + SourceStartAge + 0 + AngularVelocity 0 0 0 + InnerAngle + 3.1415927410125732421875 + OuterAngle + 0 + BurstPartCount 1 BurstRadius 0.3 BurstRate 0.02 + BurstSpeedMin + 0.1 BurstSpeedMax 1 - Endcolor + + + LL_PART_SRC_PATTERN_ANGLE + 0 + LL_PART_SRC_PATTERN_ANGLE_CONE + 1 + LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY + 0 + LL_PART_SRC_PATTERN_DROP + 0 + LL_PART_SRC_PATTERN_EXPLODE + 0 + + + + + ParticleMaxAge + 4 + + PartImageID + 0000000000000-0000-0000-000000000000 + + StartColor + + 0.9 + 0.0 + 0.8 + 0.7 + + EndColor 0.75 0.47 0.81 0 - Endscale + + StartScale + + 0.8 + 0.8 + + EndScale 0.02 0.02 - InnerAngle - 3.1415927410125732421875 + + TargetId + 00000000-0000-0000-0000-000000000000 + + LL_PART_BEAM_MASK 0 LL_PART_BOUNCE_MASK @@ -42,47 +96,13 @@ 1 LL_PART_INTERP_SCALE_MASK 1 - LL_PART_SRC_PATTERN_ANGLE - 0 - LL_PART_SRC_PATTERN_ANGLE_CONE - 1 - LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY - 0 - LL_PART_SRC_PATTERN_DROP - 0 - LL_PART_SRC_PATTERN_EXPLODE - 0 LL_PART_TARGET_LINEAR_MASK 0 LL_PART_TARGET_POS_MASK 1 LL_PART_WIND_MASK 0 - OuterAngle - 0 - PartImageID - 0000000000000-0000-0000-000000000000 - ParticleMaxAge - 0 - ParticleStartAge - 0 - SourceMaxage - 4 - Startcolor - - 0.9 - 0.0 - 0.8 - 0.7 - - Startscale - - 0.8 - 0.8 - - TargetId - 00000000-0000-0000-0000-000000000000 - BurstSpeedMin - 0.1 + + diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 204357f..c0ddac5 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp @@ -1496,8 +1496,16 @@ LLPartSysData LLVOAvatar::sCloud; void LLVOAvatar::initCloud() { // fancy particle cloud designed by Brent + std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml"); + if(!gDirUtilp->fileExists(filename)) + { + filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "cloud.xml"); + } + if(!gDirUtilp->fileExists(filename)) + { + filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml"); + } - std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml"); LLSD cloud; llifstream in_file(filename); LLSDSerialize::fromXMLDocument(cloud, in_file); -- cgit v1.1 From f270be1c97ba5331a06734f78f5f240044f2d508 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Sat, 26 Mar 2011 11:55:32 +0100 Subject: grab latest gpu table from phoenix --- linden/indra/newview/gpu_table.txt | 147 ++++++++++++++++++++----------------- 1 file changed, 78 insertions(+), 69 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt index d2092c5..51bc0f2 100644 --- a/linden/indra/newview/gpu_table.txt +++ b/linden/indra/newview/gpu_table.txt @@ -73,51 +73,54 @@ ATI M71 .*ATI.*M71.* 1 1 ATI M72 .*ATI.*M72.* 1 1 ATI M76 .*ATI.*M76.* 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 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 HD 4200 .*ATI.*Mobility.*HD.*42.* 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 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.* 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 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 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.* 2 1 -ATI Radeon HD 4600 .*ATI.*Radeon HD *46.* 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 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 HD 4800 .*ATI.*Radeon.*HD.*48.* 3 1 +ATI Radeon HD 5400 .*ATI.*Radeon.*HD.*54.* 2 1 +ATI Radeon HD 5500 .*ATI.*Radeon.*HD.*55.* 2 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 HD 6800 .*ATI.*Radeon.*HD.*68.* 3 1 +ATI Radeon HD 6900 .*ATI.*Radeon.*HD.*69.* 3 1 ATI Radeon OpenGL .*ATI.*Radeon OpenGL.* 0 0 ATI Radeon 2100 .*ATI.*Radeon 21.* 0 1 ATI Radeon 3000 .*ATI.*Radeon 30.* 0 1 -ATI Radeon 3100 .*ATI.*Radeon 31.* 0 1 +ATI Radeon 3100 .*ATI.*Radeon 31.* 1 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 @@ -136,12 +139,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 @@ -184,10 +187,7 @@ Intel Pineview .*Intel.*Pineview.* 0 1 Intel Springdale .*Intel.*Springdale.* 0 0 Matrox .*Matrox.* 0 0 Mesa .*Mesa.* 0 0 -NVIDIA 210 .*NVIDIA.*GeForce.*210.* 3 1 -NVIDIA 310 .*NVIDIA.*GeForce.*310.* 3 1 -NVIDIA 315 .*NVIDIA.*GeForce.*315.* 3 1 -NVIDIA G100 .*NVIDIA.*GeForce G *100.* 2 1 +NVIDIA 210 .*NVIDIA.*GeForce.*21.* 2 1 NVIDIA 310M .*NVIDIA.*GeForce 310M.* 0 1 NVIDIA 310 .*NVIDIA.*GeForce 310.* 0 1 NVIDIA 320M .*NVIDIA.*GeForce 320M.* 0 1 @@ -196,27 +196,33 @@ 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.* 0 1 -NVIDIA GT 130 .*NVIDIA.*GeForce GT 13.* 1 1 -NVIDIA GT 220 .*NVIDIA.*GeForce GT 22.* 0 1 -NVIDIA GT 230 .*NVIDIA.*GeForce GT 23.* 1 1 -NVIDIA GT 240 .*NVIDIA.*GeForce GT 24.* 1 1 +NVIDIA GT 120 .*NVIDIA.*GeForce.*GT.*12.* 2 1 +NVIDIA GT 130 .*NVIDIA.*GeForce.*GT.*13.* 2 1 +NVIDIA GT 220 .*NVIDIA.*GeForce.*GT.*22.* 2 1 +NVIDIA GT 230 .*NVIDIA.*GeForce.*GT.*23.* 2 1 +NVIDIA GT 240 .*NVIDIA.*GeForce.*GT.*24.* 2 1 NVIDIA GT 320 .*NVIDIA.*GeForce GT 32.* 0 1 -NVIDIA GT 330 .*NVIDIA.*GeForce GT 33.* 3 1 -NVIDIA GT 340 .*NVIDIA.*GeForce GT 34.* 3 1 NVIDIA GT 330M .*NVIDIA.*GeForce GT 330M.* 1 1 -NVIDIA GTS 150 .*NVIDIA.*GeForce GTS 15.* 3 1 -NVIDIA GTS 205 .*NVIDIA.*GeForce GTS 10.* 3 1 -NVIDIA GTS 240 .*NVIDIA.*GeForce GTS 24.* 1 1 -NVIDIA GTS 250 .*NVIDIA.*GeForce GTS 25.* 3 1 +NVIDIA GT 430 .*NVIDIA.*GeForce.*GT.*43.* 3 1 +NVIDIA GT 520 .*NVIDIA.*GeForce.*GT.*52.* 2 1 +NVIDIA GT 540 .*NVIDIA.*GeForce.*GT.*54.* 3 1 +NVIDIA GTS 240 .*NVIDIA.*GeForce *GTS.*24.* 3 1 +NVIDIA GTS 250 .*NVIDIA.*GeForce.*GTS.*25.* 3 1 +NVIDIA GTS 450 .*NVIDIA.*GeForce.*GTS.*45.* 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 285 .*NVIDIA.*GeForce.*GTX.*28.* 3 1 +NVIDIA GTX 290 .*NVIDIA.*GeForce.*GTX.*29.* 3 1 +NVIDIA GTX 295 .*NVIDIA.*GeForce.*GTX.*29.* 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 465 .*NVIDIA.*GeForce GTX 46.* 3 1 -NVIDIA GTX 470 .*NVIDIA.*GeForce GTX 47.* 3 1 -NVIDIA GTX 480 .*NVIDIA.*GeForce GTX 48.* 3 1 +NVIDIA GTX 460 .*NVIDIA.*GeForce.*GTX.*46.* 3 1 +NVIDIA GTX 465 .*NVIDIA.*GeForce.*GTX.*46.* 3 1 +NVIDIA GTX 470 .*NVIDIA.*GeForce.*GTX.*47.* 3 1 +NVIDIA GTX 480 .*NVIDIA.*GeForce.*GTX.*48.* 3 1 +NVIDIA GTX 560 .*NVIDIA.*GeForce.*GTX.*56.* 3 1 +NVIDIA GTX 570 .*NVIDIA.*GeForce.*GTX.*57.* 3 1 +NVIDIA GTX 580 .*NVIDIA.*GeForce.*GTX.*58.* 3 1 NVIDIA C51 .*NVIDIA.*C51.* 0 1 NVIDIA G72 .*NVIDIA.*G72.* 1 1 NVIDIA G73 .*NVIDIA.*G73.* 1 1 @@ -240,29 +246,31 @@ 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.* 1 1 -NVIDIA GeForce 7800 .*NVIDIA.*GeForce 78.* 1 1 -NVIDIA GeForce 7900 .*NVIDIA.*GeForce 79.* 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 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.* 1 1 +NVIDIA GeForce 8500 .*GeForce 85.* 3 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 9200M .*NVIDIA.*GeForce 9200M.* 1 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 9200 .*NVIDIA.*GeForce 92.* 1 1 NVIDIA GeForce 9300 .*NVIDIA.*GeForce 93.* 1 1 NVIDIA GeForce 9400 .*GeForce 94.* 1 1 NVIDIA GeForce 9500 .*NVIDIA.*GeForce 95.* 2 1 -NVIDIA GeForce 9600 .*NVIDIA.*GeForce.*96.* 3 1 +NVIDIA GeForce 9600 .*NVIDIA.*GeForce.*96.* 2 1 NVIDIA GeForce 9800 .*NVIDIA.*GeForce.*98.* 3 1 NVIDIA GeForce FX 5100 .*NVIDIA.*GeForce FX 51.* 0 1 NVIDIA GeForce FX 5200 .*NVIDIA.*GeForce FX 52.* 0 1 @@ -299,6 +307,7 @@ 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 ION 2 .*NVIDIA ION 2.* 1 1 NVIDIA NB9M .*GeForce NB9M.* 1 1 NVIDIA NB9P .*GeForce NB9P.* 1 1 NVIDIA GeForce PCX .*GeForce PCX.* 0 1 -- cgit v1.1