summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/featuretable.txt8
-rw-r--r--indra/newview/featuretable_linux.txt31
-rw-r--r--indra/newview/featuretable_mac.txt66
-rw-r--r--indra/newview/featuretable_solaris.txt193
-rw-r--r--indra/newview/featuretable_xp.txt714
-rw-r--r--indra/newview/llfeaturemanager.cpp19
6 files changed, 63 insertions, 968 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index c589c508e8..be8ea2bab9 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -80,7 +80,7 @@ RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
RenderAvatarMaxNonImpostors 1 3
-RenderAvatarMaxComplexity 1 35000
+RenderAvatarMaxComplexity 1 25000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -140,6 +140,7 @@ list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
+RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
RenderAvatarVP 1 1
RenderFarClip 1 96
@@ -169,6 +170,7 @@ list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -198,6 +200,7 @@ list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -227,6 +230,7 @@ list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -256,6 +260,7 @@ list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -278,7 +283,6 @@ RenderShadowDetail 1 2
WLSkyDetail 1 48
RenderFSAASamples 1 2
-
//
// Ultra graphics (REALLY PURTY!)
//
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 121559bb7a..ca6c00951d 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -1,5 +1,5 @@
version 28
-// The version number above should be implemented IF AND ONLY IF some
+// The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended
// defaults. This should be as rare an event as we can manage.
@@ -31,8 +31,10 @@ RenderAnisotropic 1 1
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxNonImpostors 1 12
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderAvatarVP 1 1
+RenderAutoMuteSurfaceAreaLimit 1 1000.0
RenderCubeMap 1 1
RenderDelayVBUpdate 1 0
RenderFarClip 1 256
@@ -41,9 +43,9 @@ RenderFogRatio 1 4.0
RenderGamma 1 0
RenderGlowResolutionPow 1 9
RenderGround 1 1
-RenderLocalLights 1 1
RenderMaxPartCount 1 8192
RenderObjectBump 1 1
+RenderLocalLights 1 1
RenderReflectionDetail 1 4
RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0
@@ -61,7 +63,7 @@ Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1
RenderTextureMemoryMultiple 1 1.0
RenderCompressTextures 1 1
-RenderShaderLightingMaxLevel 1 3
+RenderShaderLightingMaxLevel 1 3
RenderDeferred 1 1
RenderDeferredSSAO 1 1
RenderShadowDetail 1 2
@@ -77,6 +79,7 @@ RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 25000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -89,7 +92,7 @@ RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderVolumeLODFactor 1 0.5
+RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0
RenderDeferred 1 0
@@ -107,6 +110,7 @@ RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
RenderAvatarMaxNonImpostors 1 3
+RenderAvatarMaxComplexity 1 35000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -119,7 +123,7 @@ RenderTerrainDetail 1 0
RenderTerrainLODFactor 1 1
RenderTransparentWater 1 0
RenderTreeLODFactor 1 0
-RenderVolumeLODFactor 1 0.5
+RenderVolumeLODFactor 1 1.125
VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0
RenderDeferred 1 0
@@ -135,6 +139,7 @@ list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
+RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
RenderAvatarVP 1 1
RenderFarClip 1 96
@@ -164,6 +169,7 @@ list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -193,6 +199,7 @@ list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -222,6 +229,7 @@ list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -251,6 +259,7 @@ list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -336,13 +345,13 @@ list Class3
RenderVBOEnable 1 1
//
-// Class 4 Hardware
+// Class 4 Hardware
//
list Class4
RenderVBOEnable 1 1
//
-// Class 5 Hardware
+// Class 5 Hardware
//
list Class5
RenderVBOEnable 1 1
@@ -386,14 +395,17 @@ list MapBufferRange
RenderVBOMappingDisable 1 1
-
+//
// "Default" setups for safe, low, medium, high
//
list safe
RenderAnisotropic 1 0
RenderAvatarCloth 0 0
RenderAvatarVP 0 0
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderObjectBump 0 0
+RenderLocalLights 1 0
RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0
RenderVBOEnable 1 0
@@ -403,7 +415,6 @@ RenderDeferred 0 0
RenderDeferredSSAO 0 0
RenderShadowDetail 0 0
-
//
// CPU based feature masks
//
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index ce068819e2..ea69b088f9 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,5 +1,5 @@
version 37
-// The version number above should be implemented IF AND ONLY IF some
+// The version number above should be incremented IF AND ONLY IF some
// change has been made that is sufficiently important to justify
// resetting the graphics preferences of all users to the recommended
// defaults. This should be as rare an event as we can manage.
@@ -31,38 +31,38 @@ RenderAnisotropic 1 0
RenderAvatarCloth 1 1
RenderAvatarLODFactor 1 1.0
RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxNonImpostors 1 12
-RenderAvatarMaxComplexity 1 60000
+RenderAvatarMaxNonImpostors 1 16
+RenderAvatarMaxComplexity 1 80000
RenderAvatarVP 1 1
RenderAutoMuteSurfaceAreaLimit 1 1000.0
-RenderCubeMap 1 1
-RenderDelayVBUpdate 1 0
-RenderFarClip 1 256
-RenderFlexTimeFactor 1 1.0
-RenderFogRatio 1 4.0
-RenderGamma 1 0
-RenderGlowResolutionPow 1 9
-RenderGround 1 1
-RenderLocalLights 1 1
-RenderMaxPartCount 1 8192
-RenderObjectBump 1 1
-RenderReflectionDetail 1 4
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 1.0
-RenderVBOEnable 1 1
-RenderVBOMappingDisable 1 1
-RenderVolumeLODFactor 1 2.0
-UseStartScreen 1 1
-UseOcclusion 1 1
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-WLSkyDetail 1 128
+RenderCubeMap 1 1
+RenderDelayVBUpdate 1 0
+RenderFarClip 1 256
+RenderFlexTimeFactor 1 1.0
+RenderFogRatio 1 4.0
+RenderGamma 1 0
+RenderGlowResolutionPow 1 9
+RenderGround 1 1
+RenderMaxPartCount 1 8192
+RenderObjectBump 1 1
+RenderLocalLights 1 1
+RenderReflectionDetail 1 4
+RenderTerrainDetail 1 1
+RenderTerrainLODFactor 1 2.0
+RenderTransparentWater 1 1
+RenderTreeLODFactor 1 1.0
+RenderVBOEnable 1 1
+RenderVBOMappingDisable 1 1
+RenderVolumeLODFactor 1 2.0
+UseStartScreen 1 1
+UseOcclusion 1 1
+VertexShaderEnable 1 1
+WindLightUseAtmosShaders 1 1
+WLSkyDetail 1 128
Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1
-RenderTextureMemoryMultiple 1 1
-RenderCompressTextures 1 1
+RenderTextureMemoryMultiple 1 1.0
+RenderCompressTextures 1 1
RenderShaderLightingMaxLevel 1 3
RenderDeferred 1 1
RenderDeferredSSAO 1 1
@@ -80,7 +80,7 @@ RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0
RenderAvatarPhysicsLODFactor 1 0
RenderAvatarMaxNonImpostors 1 3
-RenderAvatarMaxComplexity 1 35000
+RenderAvatarMaxComplexity 1 25000
RenderAvatarVP 1 0
RenderFarClip 1 64
RenderFlexTimeFactor 1 0
@@ -140,6 +140,7 @@ list LowMid
RenderAnisotropic 1 0
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 0.5
+RenderAvatarMaxComplexity 1 100000
RenderAvatarPhysicsLODFactor 1 0.75
RenderAvatarVP 1 1
RenderFarClip 1 96
@@ -169,6 +170,7 @@ list Mid
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 200000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -198,6 +200,7 @@ list MidHigh
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 250000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -227,6 +230,7 @@ list High
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 300000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -256,6 +260,7 @@ list HighUltra
RenderAnisotropic 1 1
RenderAvatarCloth 1 0
RenderAvatarLODFactor 1 1.0
+RenderAvatarMaxComplexity 1 350000
RenderAvatarPhysicsLODFactor 1 1.0
RenderAvatarVP 1 1
RenderFarClip 1 128
@@ -278,7 +283,6 @@ RenderShadowDetail 1 2
WLSkyDetail 1 48
RenderFSAASamples 1 2
-
//
// Ultra graphics (REALLY PURTY!)
//
diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt
deleted file mode 100644
index f6f0a9cb17..0000000000
--- a/indra/newview/featuretable_solaris.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-version 15
-// The version number above should be implemented IF AND ONLY IF some
-// change has been made that is sufficiently important to justify
-// resetting the graphics preferences of all users to the recommended
-// defaults. This should be as rare an event as we can manage.
-
-// NOTE: This is mostly identical to featuretable.txt with a few differences
-// Should be combined into one table
-
-//
-// Generates lists of feature mask that can be applied on top of each other.
-//
-// // Begin comments
-// list <name>
-// Starts a feature list named <name>
-// <name> <available> <recommended>
-// <name> is the name of a feature
-// <available> is 0 or 1, whether the feature is available
-// <recommended> is an S32 which is the recommended value
-//
-// For now, the first list read sets up all of the default values
-//
-
-
-//
-// All contains everything at their default settings for high end machines
-// NOTE: All settings are set to the MIN of applied values, including 'all'!
-//
-list all
-RenderVBO 1 1
-RenderAniso 1 0
-RenderAvatarMode 1 2
-RenderAvatarVP 1 1
-RenderDistance 1 128
-RenderLighting 1 1
-RenderObjectBump 1 1
-RenderParticleCount 1 4096
-RenderRippleWater 1 1
-RenderTerrainDetail 1 2
-VertexShaderEnable 1 1
-RenderTextureMemoryMultiple 1 1.0
-UseOcclusion 1 1
-RenderCubeMap 1 1
-WatchdogDisabled 1 1
-RenderUseFBO 1 1
-
-
-//
-// Class 0 Hardware (Unknown or just old)
-//
-list Class0
-VertexShaderEnable 1 0
-RenderVBO 1 0
-RenderDistance 1 64
-RenderAvatarVP 1 0
-RenderAvatarMode 1 0
-RenderLighting 1 0
-RenderObjectBump 1 0
-RenderRippleWater 1 0
-RenderUseFBO 1 0
-
-//
-// Class 1 Hardware
-//
-list Class1
-VertexShaderEnable 1 0
-RenderVBO 1 1
-RenderDistance 1 96
-RenderAvatarVP 1 1
-RenderAvatarMode 1 0
-RenderLighting 1 0
-RenderObjectBump 1 0
-RenderRippleWater 1 0
-RenderUseFBO 1 0
-
-//
-// Class 2 Hardware (make it purty)
-//
-list Class2
-VertexShaderEnable 1 1
-RenderAvatarVP 1 1
-RenderAvatarMode 1 1
-RenderLighting 1 1
-RenderObjectBump 1 1
-RenderRippleWater 1 1
-RenderUseFBO 1 1
-
-//
-// Class 3 Hardware (make it purty)
-//
-list Class3
-VertexShaderEnable 1 1
-RenderAvatarVP 1 1
-RenderAvatarMode 1 1
-RenderLighting 1 1
-RenderObjectBump 1 1
-RenderRippleWater 1 1
-RenderUseFBO 1 1
-
-//
-// No Pixel Shaders available
-//
-list NoPixelShaders
-VertexShaderEnable 0 0
-RenderAvatarVP 0 0
-
-//
-// No Vertex Shaders available
-//
-list NoVertexShaders
-VertexShaderEnable 0 0
-RenderAvatarVP 0 0
-
-//
-// "Default" setups for safe, low, medium, high
-//
-list safe
-RenderVBO 1 0
-RenderAniso 1 0
-RenderAvatarVP 0 0
-RenderLighting 1 0
-RenderParticleCount 1 1024
-RenderTerrainDetail 1 0
-RenderCubeMap 0 0
-UseOcclusion 0 0
-RenderUseFBO 1 0
-
-
-list low
-RenderVBO 1 0
-RenderAniso 1 0
-RenderAvatarMaxNonImpostors 1 3
-RenderLighting 1 0
-
-list medium
-RenderLighting 1 0
-
-
-//
-// CPU based feature masks
-//
-
-// 1Ghz or less (equiv)
-list CPUSlow
-RenderParticleCount 1 1024
-
-
-//
-// RAM based feature masks
-//
-list RAM256MB
-RenderObjectBump 0 0
-
-
-//
-// Graphics card based feature masks
-//
-list OpenGLPre15
-RenderVBO 1 0
-
-list Intel
-RenderVBO 1 0
-RenderAniso 1 0
-RenderLighting 1 0
-RenderTerrainDetail 1 0
-RenderCubeMap 0 0
-
-list GeForce2
-RenderVBO 1 1
-RenderAniso 1 0
-RenderLighting 1 0
-RenderParticleCount 1 2048
-RenderTerrainDetail 1 0
-
-list GeForce3
-
-list ATI
-UseOcclusion 0 0
-
-list Radeon8500
-RenderLighting 1 0
-RenderParticleCount 1 4096
-
-// Hacked to be paranoid "safe"
-list Radeon9700
-RenderParticleCount 1 4096
-
-// Hacked to be paranoid "safe"
-list MobilityRadeon9000
-RenderLighting 1 0
-RenderParticleCount 1 4096
-
-list GeForceFX
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt
deleted file mode 100644
index 053dfb64d4..0000000000
--- a/indra/newview/featuretable_xp.txt
+++ /dev/null
@@ -1,714 +0,0 @@
-version 32
-// The version number above should be implemented IF AND ONLY IF some
-// change has been made that is sufficiently important to justify
-// resetting the graphics preferences of all users to the recommended
-// defaults. This should be as rare an event as we can manage.
-
-// NOTE: This is mostly identical to featuretable_mac.txt with a few differences
-// Should be combined into one table
-
-//
-// Generates lists of feature mask that can be applied on top of each other.
-//
-// // Begin comments
-// list <name>
-// Starts a feature list named <name>
-// <name> <available> <recommended>
-// <name> is the name of a feature
-// <available> is 0 or 1, whether the feature is available
-// <recommended> is an F32 which is the recommended value
-//
-// For now, the first list read sets up all of the default values
-//
-
-
-//
-// All contains everything at their default settings for high end machines
-// NOTE: All settings are set to the MIN of applied values, including 'all'!
-//
-list all
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 1
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarMaxNonImpostors 1 12
-RenderAvatarVP 1 1
-RenderCubeMap 1 1
-RenderDelayVBUpdate 1 0
-RenderFarClip 1 256
-RenderFlexTimeFactor 1 1.0
-RenderFogRatio 1 4.0
-RenderGamma 1 0
-RenderGlowResolutionPow 1 9
-RenderGround 1 1
-RenderLocalLights 1 1
-RenderMaxPartCount 1 8192
-RenderObjectBump 1 1
-RenderReflectionDetail 1 4
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 1.0
-RenderVBOEnable 1 1
-RenderVBOMappingDisable 1 1
-RenderVolumeLODFactor 1 2.0
-UseStartScreen 1 1
-UseOcclusion 1 1
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-WLSkyDetail 1 128
-Disregard128DefaultDrawDistance 1 1
-Disregard96DefaultDrawDistance 1 1
-RenderTextureMemoryMultiple 1 1.0
-RenderCompressTextures 1 1
-RenderShaderLightingMaxLevel 1 3
-RenderDeferred 1 1
-RenderDeferredSSAO 1 1
-RenderShadowDetail 1 2
-WatchdogDisabled 1 1
-RenderUseStreamVBO 1 1
-RenderFSAASamples 1 16
-RenderMaxTextureIndex 1 16
-
-//
-// Low Graphics Settings (fixed function)
-//
-list LowFixedFunction
-RenderAnisotropic 1 0
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 0
-RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxNonImpostors 1 3
-RenderAvatarVP 1 0
-RenderFarClip 1 64
-RenderFlexTimeFactor 1 0
-RenderGlowResolutionPow 1 8
-RenderLocalLights 1 0
-RenderMaxPartCount 1 0
-RenderObjectBump 1 0
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 0
-RenderTerrainLODFactor 1 1
-RenderTransparentWater 1 0
-RenderTreeLODFactor 1 0
-RenderVolumeLODFactor 1 0.5
-VertexShaderEnable 1 0
-WindLightUseAtmosShaders 1 0
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 0
-
-//
-// Low Graphics Settings
-//
-list Low
-RenderAnisotropic 1 0
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 0
-RenderAvatarPhysicsLODFactor 1 0
-RenderAvatarMaxNonImpostors 1 3
-RenderAvatarVP 1 0
-RenderFarClip 1 64
-RenderFlexTimeFactor 1 0
-RenderGlowResolutionPow 1 8
-RenderLocalLights 1 0
-RenderMaxPartCount 1 0
-RenderObjectBump 1 0
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 0
-RenderTerrainLODFactor 1 1
-RenderTransparentWater 1 0
-RenderTreeLODFactor 1 0
-RenderVolumeLODFactor 1 0.5
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 0
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 0
-
-//
-// Medium Low Graphics Settings
-//
-list LowMid
-RenderAnisotropic 1 0
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 0.5
-RenderAvatarPhysicsLODFactor 1 0.75
-RenderAvatarVP 1 1
-RenderFarClip 1 96
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 8
-RenderMaxPartCount 1 2048
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 1.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 0
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 0
-
-//
-// Medium Graphics Settings (standard)
-//
-list Mid
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// Medium High Graphics Settings (deferred enabled)
-//
-list MidHigh
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 1
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// High Graphics Settings (deferred + SSAO)
-//
-list High
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 1
-RenderDeferredSSAO 1 1
-RenderShadowDetail 1 0
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// High Ultra Graphics Settings (deferred + SSAO + shadows)
-//
-list HighUltra
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 0
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 128
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderMaxPartCount 1 4096
-RenderObjectBump 1 1
-RenderLocalLights 1 1
-RenderReflectionDetail 1 0
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 0.5
-RenderVolumeLODFactor 1 1.125
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-RenderDeferred 1 1
-RenderDeferredSSAO 1 1
-RenderShadowDetail 1 2
-WLSkyDetail 1 48
-RenderFSAASamples 1 2
-
-//
-// Ultra graphics (REALLY PURTY!)
-//
-list Ultra
-RenderAnisotropic 1 1
-RenderAvatarCloth 1 1
-RenderAvatarLODFactor 1 1.0
-RenderAvatarPhysicsLODFactor 1 1.0
-RenderAvatarVP 1 1
-RenderFarClip 1 256
-RenderFlexTimeFactor 1 1.0
-RenderGlowResolutionPow 1 9
-RenderLocalLights 1 1
-RenderMaxPartCount 1 8192
-RenderObjectBump 1 1
-RenderReflectionDetail 1 4
-RenderTerrainDetail 1 1
-RenderTerrainLODFactor 1 2.0
-RenderTransparentWater 1 1
-RenderTreeLODFactor 1 1.0
-RenderVolumeLODFactor 1 2.0
-VertexShaderEnable 1 1
-WindLightUseAtmosShaders 1 1
-WLSkyDetail 1 128
-RenderDeferred 1 0
-RenderDeferredSSAO 1 0
-RenderShadowDetail 1 2
-RenderFSAASamples 1 2
-
-//
-// Class Unknown Hardware (unknown)
-//
-list Unknown
-RenderVBOEnable 1 0
-
-//
-// Class 0 Hardware (just old)
-//
-list Class0
-RenderVBOEnable 1 1
-
-//
-// Class 1 Hardware
-//
-list Class1
-RenderVBOEnable 1 1
-
-//
-// Class 2 Hardware
-//
-list Class2
-RenderVBOEnable 1 1
-
-//
-// Class 3 Hardware
-//
-list Class3
-RenderVBOEnable 1 1
-
-//
-// Class 4 Hardware (deferred + SSAO)
-//
-list Class4
-RenderVBOEnable 1 1
-
-//
-// Class 5 Hardware
-//
-list Class5
-RenderVBOEnable 1 1
-
-//
-// VRAM > 512MB
-//
-list VRAMGT512
-RenderCompressTextures 1 0
-
-//
-// No Pixel Shaders available
-//
-list NoPixelShaders
-RenderAvatarVP 0 0
-RenderAvatarCloth 0 0
-RenderReflectionDetail 0 0
-VertexShaderEnable 0 0
-WindLightUseAtmosShaders 0 0
-RenderDeferred 0 0
-RenderDeferredSSAO 0 0
-RenderShadowDetail 0 0
-
-//
-// No Vertex Shaders available
-//
-list NoVertexShaders
-RenderAvatarVP 0 0
-RenderAvatarCloth 0 0
-RenderReflectionDetail 0 0
-VertexShaderEnable 0 0
-WindLightUseAtmosShaders 0 0
-RenderDeferred 0 0
-RenderDeferredSSAO 0 0
-RenderShadowDetail 0 0
-
-//
-// GL_ARB_map_buffer_range exists
-//
-list MapBufferRange
-RenderVBOMappingDisable 1 1
-
-
-//
-// "Default" setups for safe, low, medium, high
-//
-list safe
-RenderAnisotropic 1 0
-RenderAvatarCloth 0 0
-RenderAvatarVP 0 0
-RenderObjectBump 0 0
-RenderMaxPartCount 1 1024
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-RenderReflectionDetail 0 0
-WindLightUseAtmosShaders 0 0
-RenderDeferred 0 0
-RenderDeferredSSAO 0 0
-RenderShadowDetail 0 0
-
-//
-// CPU based feature masks
-//
-
-// 1Ghz or less (equiv)
-list CPUSlow
-RenderMaxPartCount 1 1024
-
-//
-// RAM based feature masks
-//
-list RAM256MB
-RenderObjectBump 0 0
-
-//
-// Graphics card based feature masks
-//
-list OpenGLPre15
-RenderVBOEnable 1 0
-
-list OpenGLPre30
-RenderDeferred 0 0
-RenderMaxTextureIndex 1 1
-
-list Intel
-RenderAnisotropic 1 0
-RenderVBOEnable 1 0
-RenderFSAASamples 1 0
-
-list GeForce2
-RenderAnisotropic 1 0
-RenderMaxPartCount 1 2048
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 1
-
-list SiS
-UseOcclusion 0 0
-
-
-list Intel_830M
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_845G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_855GM
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_865G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_900
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_915GM
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_915G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_945GM
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_945G
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_950
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_965
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-UseOcclusion 0 0
-
-list Intel_G33
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_G45
-WindLightUseAtmosShaders 0 0
-
-list Intel_Bear_Lake
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Broadwater
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Brookdale
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Eaglelake
-WindLightUseAtmosShaders 0 0
-
-list Intel_Montara
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-list Intel_Springdale
-RenderTerrainDetail 1 0
-RenderVBOEnable 1 0
-
-
-list ATI_FireGL_5200
-RenderVBOEnable 1 0
-WindLightUseAtmosShaders 0 0
-
-
-list ATI_Mobility_Radeon_7xxx
-RenderVBOEnable 0 0
-
-list ATI_Radeon_7xxx
-RenderVBOEnable 0 0
-
-list ATI_All-in-Wonder_Radeon
-RenderVBOEnable 0 0
-
-list ATI_All-in-Wonder_7500
-RenderVBOEnable 0 0
-
-list ATI_Mobility_Radeon_9600
-Disregard96DefaultDrawDistance 1 0
-
-
-/// tweaked ATI to 96 Draw distance
-
-list ATI_Radeon_9000
-Disregard96DefaultDrawDistance 1 0
-list ATI_Radeon_9200
-Disregard96DefaultDrawDistance 1 0
-list ATI_Radeon_9500
-Disregard96DefaultDrawDistance 1 0
-list ATI_Radeon_9600
-Disregard96DefaultDrawDistance 1 0
-
-/// tweaked ATI to 128 draw distance
-
-list ATI_Radeon_X300
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X400
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X500
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X600
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X700
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X1300
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-UseStartScreen 0 0
-list ATI_Radeon_X1400
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X1500
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-UseStartScreen 0 0
-list ATI_Radeon_X1600
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Radeon_X1700
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-list ATI_Mobility_Radeon_X1xxx
-Disregard128DefaultDrawDistance 1 0
-RenderVBOEnable 1 0
-
-list ATI_Radeon_HD_2300
-Disregard128DefaultDrawDistance 1 0
-list ATI_Radeon_HD_2400
-Disregard128DefaultDrawDistance 1 0
-list ATI_ASUS_AH24xx
-Disregard128DefaultDrawDistance 1 0
-
-
-// Avatar hardware skinning causes invisible avatars
-// on various ATI chipsets on drivers before 8.2
-
-list ATIOldDriver
-RenderAvatarVP 0 0
-RenderAvatarCloth 0 0
-RenderVBOEnable 1 0
-
-// ATI cards generally perform better when not using VBOs for streaming data
-
-list ATI
-RenderUseStreamVBO 1 0
-
-// Disable vertex buffer objects by default for ATI cards with little video memory
-list ATIVramLT256
-RenderVBOEnable 1 0
-
-/// Tweaked NVIDIA
-
-list NVIDIA_GeForce_FX_5100
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_5200
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_5500
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_5600
-Disregard96DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_FX_Go5100
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5200
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5300
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5500
-Disregard96DefaultDrawDistance 1 0
-list NVIDIA_GeForce_FX_Go5600
-Disregard96DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_6100
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_6200
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_6500
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_6600
-Disregard128DefaultDrawDistance 1 0
-
-list NVIDIA_G73
-Disregard128DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_Go_6100
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6200
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6500
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6600
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6700
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6800
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-list NVIDIA_GeForce_Go_6
-RenderVBOEnable 1 0
-Disregard128DefaultDrawDistance 1 0
-
-list NVIDIA_GeForce_7000
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7100
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7200
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7300
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7400
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7500
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7600
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7700
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7800
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_7900
-RenderShaderLightingMaxLevel 1 2
-
-list NVIDIA_GeForce_Go_7200
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7300
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7300_LE
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7400
-Disregard128DefaultDrawDistance 1 0
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7600
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7700
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7800
-RenderShaderLightingMaxLevel 1 2
-list NVIDIA_GeForce_Go_7900
-RenderShaderLightingMaxLevel 1 2
-
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 063a3a521f..04da8f25cd 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -180,16 +180,14 @@ BOOL LLFeatureList::maskList(LLFeatureList &mask)
void LLFeatureList::dump()
{
LL_DEBUGS("RenderInit") << "Feature list: " << mName << LL_ENDL;
- LL_DEBUGS("RenderInit") << "--------------" << LL_ENDL;
LLFeatureInfo fi;
feature_map_t::iterator feature_it;
for (feature_it = mFeatures.begin(); feature_it != mFeatures.end(); ++feature_it)
{
fi = feature_it->second;
- LL_DEBUGS("RenderInit") << fi.mName << "\t\t" << fi.mAvailable << ":" << fi.mRecommendedLevel << LL_ENDL;
+ LL_DEBUGS("RenderInit") << "With " << mName << " feature " << fi.mName << " " << fi.mAvailable << ":" << fi.mRecommendedLevel << LL_ENDL;
}
- LL_DEBUGS("RenderInit") << LL_ENDL;
}
static const std::vector<std::string> sGraphicsLevelNames = boost::assign::list_of
@@ -279,26 +277,11 @@ bool LLFeatureManager::loadFeatureTables()
std::string filename;
std::string http_filename;
-#if LL_WINDOWS
- std::string os_string = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
- if (os_string.find("Microsoft Windows XP") == 0)
- {
- filename = llformat(FEATURE_TABLE_FILENAME, "_xp");
- http_filename = llformat(FEATURE_TABLE_VER_FILENAME, "_xp", LLVersionInfo::getVersion().c_str());
- }
- else
- {
- filename = llformat(FEATURE_TABLE_FILENAME, "");
- http_filename = llformat(FEATURE_TABLE_VER_FILENAME, "", LLVersionInfo::getVersion().c_str());
- }
-#else
filename = FEATURE_TABLE_FILENAME;
http_filename = llformat(FEATURE_TABLE_VER_FILENAME, LLVersionInfo::getVersion().c_str());
-#endif
app_path += filename;
-
// second table is downloaded with HTTP - note that this will only be used on the run _after_ it is downloaded
std::string http_path = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, http_filename);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 03:06:31 +0000