Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated featuretables. Ultra now enables deferred except without shadows. Also cleaned up to work with renamed/removed settings.

Browse Source
This commit is contained in:
Shyotl
2011-05-22 22:27:27 -05:00
parent 21498e0486
commit 34f252f52e
6 changed files with 149 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@@ -10465,7 +10465,7 @@
<key>Type</key> <key>Type</key>
<string>S32</string> <string>S32</string>
<key>Value</key> <key>Value</key>
<integer>2</integer> <integer>0</integer>
</map> </map>
<key>RenderReflectionRes</key> <key>RenderReflectionRes</key>

82
indra/newview/featuretable.txt
View File

@@ -34,18 +34,16 @@ RenderFogRatio 1 4.0
RenderGamma 1 0 RenderGamma 1 0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderGround 1 1 RenderGround 1 1
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 8192 RenderMaxPartCount 1 8192
RenderNightBrightness 1 1.0
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 3 RenderReflectionDetail 1 4
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0 RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 1.0 RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVBOEnable 1 1 RenderVBOEnable 1 1
RenderVolumeLODFactor 1 2.0 RenderVolumeLODFactor 1 2.0
RenderWaterReflections 1 1
UseStartScreen 1 1 UseStartScreen 1 1
UseOcclusion 1 1 UseOcclusion 1 1
VertexShaderEnable 1 1 VertexShaderEnable 1 1
@@ -55,9 +53,12 @@ Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1
RenderShaderLightingMaxLevel 1 3 RenderShaderLightingMaxLevel 1 3
RenderTextureMemoryMultiple 1 1.0 RenderTextureMemoryMultiple 1 1.0
RenderUseFBO 1 1 RenderUseFBO 1 1
RenderDeferred 1 1 RenderFastAlpha 1 1
RenderFastAlpha 1 1 RenderDeferred 1 1
RenderDeferredGI 1 1
RenderShadowDetail 1 2
RenderAvatarPhysicsLODFactor 1 1.0
// //
// Low Graphics Settings // Low Graphics Settings
@@ -70,7 +71,7 @@ RenderAvatarVP 1 0
RenderFarClip 1 64 RenderFarClip 1 64
RenderFlexTimeFactor 1 0.1 RenderFlexTimeFactor 1 0.1
RenderGlowResolutionPow 1 8 RenderGlowResolutionPow 1 8
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderMaxPartCount 1 1024 RenderMaxPartCount 1 1024
RenderObjectBump 1 0 RenderObjectBump 1 0
RenderReflectionDetail 1 0 RenderReflectionDetail 1 0
@@ -79,13 +80,15 @@ RenderTerrainLODFactor 1 1
RenderTreeLODFactor 1 0.25 RenderTreeLODFactor 1 0.25
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 0.5 RenderVolumeLODFactor 1 0.5
RenderWaterReflections 1 0
VertexShaderEnable 1 0 VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0 WindLightUseAtmosShaders 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 0 0 RenderUseFBO 0 0
RenderDeferred 0 0 RenderFastAlpha 1 1
RenderFastAlpha 0 0 RenderDeferred 0 0
RenderDeferredGI 0 0
RenderShadowDetail 0 0
RenderAvatarPhysicsLODFactor 1 0.0
// //
// Mid Graphics Settings // Mid Graphics Settings
@@ -98,7 +101,7 @@ RenderAvatarVP 1 1
RenderFarClip 1 96 RenderFarClip 1 96
RenderFlexTimeFactor 1 0.5 RenderFlexTimeFactor 1 0.5
RenderGlowResolutionPow 1 8 RenderGlowResolutionPow 1 8
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 0 RenderReflectionDetail 1 0
@@ -107,13 +110,15 @@ RenderTerrainLODFactor 1 1.0
RenderTreeLODFactor 1 0.5 RenderTreeLODFactor 1 0.5
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125 RenderVolumeLODFactor 1 1.125
RenderWaterReflections 1 0
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0 WindLightUseAtmosShaders 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderFastAlpha 1 0
RenderFastAlpha 1 0 RenderDeferred 1 0
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 0.5
// //
@@ -127,7 +132,7 @@ RenderAvatarVP 1 1
RenderFarClip 1 128 RenderFarClip 1 128
RenderFlexTimeFactor 1 1.0 RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 4096 RenderMaxPartCount 1 4096
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 2 RenderReflectionDetail 1 2
@@ -136,13 +141,15 @@ RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 0.5 RenderTreeLODFactor 1 0.5
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125 RenderVolumeLODFactor 1 1.125
RenderWaterReflections 1 0
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1 WindLightUseAtmosShaders 1 1
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderFastAlpha 1 0
RenderFastAlpha 1 0 RenderDeferred 1 0
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 0.75
// //
@@ -156,22 +163,24 @@ RenderAvatarVP 1 1
RenderFarClip 1 256 RenderFarClip 1 256
RenderFlexTimeFactor 1 1.0 RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 8192 RenderMaxPartCount 1 8192
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 3 RenderReflectionDetail 1 4
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0 RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 1.0 RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 2.0 RenderVolumeLODFactor 1 2.0
RenderWaterReflections 1 1
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1 WindLightUseAtmosShaders 1 1
WLSkyDetail 1 128 WLSkyDetail 1 128
RenderUseFBO 1 1 RenderUseFBO 1 1
RenderDeferred 1 1 RenderFastAlpha 1 0
RenderFastAlpha 1 1 RenderDeferred 1 1
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 1.0
// //
// Class Unknown Hardware (unknown) // Class Unknown Hardware (unknown)
@@ -209,9 +218,10 @@ RenderVBOEnable 1 1
list NoPixelShaders list NoPixelShaders
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
VertexShaderEnable 0 0 VertexShaderEnable 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
// //
// No Vertex Shaders available // No Vertex Shaders available
@@ -219,9 +229,10 @@ WindLightUseAtmosShaders 0 0
list NoVertexShaders list NoVertexShaders
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
VertexShaderEnable 0 0 VertexShaderEnable 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
// "Default" setups for safe, low, medium, high // "Default" setups for safe, low, medium, high
// //
@@ -229,14 +240,16 @@ list safe
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderObjectBump 0 0 RenderObjectBump 0 0
RenderMaxPartCount 1 1024 RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0 RenderTerrainDetail 1 0
RenderUseImpostors 0 0 RenderUseImpostors 0 0
RenderVBOEnable 1 0 RenderVBOEnable 1 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderUseFBO 1 0
RenderDeferred 1 0
// //
// CPU based feature masks // CPU based feature masks
@@ -260,12 +273,13 @@ RenderVBOEnable 1 0
list Intel list Intel
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderUseImpostors 0 0 RenderUseImpostors 0 0
RenderDeferred 1 0
list GeForce2 list GeForce2
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderTerrainDetail 1 0 RenderTerrainDetail 1 0
RenderVBOEnable 1 1 RenderVBOEnable 1 1

84
indra/newview/featuretable_linux.txt
View File

@@ -34,18 +34,16 @@ RenderFogRatio 1 4.0
RenderGamma 1 0 RenderGamma 1 0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderGround 1 1 RenderGround 1 1
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 8192 RenderMaxPartCount 1 8192
RenderNightBrightness 1 1.0
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 3 RenderReflectionDetail 1 4
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0 RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 1.0 RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVBOEnable 1 1 RenderVBOEnable 1 1
RenderVolumeLODFactor 1 2.0 RenderVolumeLODFactor 1 2.0
RenderWaterReflections 1 1
UseStartScreen 1 1 UseStartScreen 1 1
UseOcclusion 1 1 UseOcclusion 1 1
VertexShaderEnable 1 1 VertexShaderEnable 1 1
@@ -55,9 +53,12 @@ Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1
RenderShaderLightingMaxLevel 1 3 RenderShaderLightingMaxLevel 1 3
RenderTextureMemoryMultiple 1 1.0 RenderTextureMemoryMultiple 1 1.0
RenderUseFBO 1 1 RenderUseFBO 1 1
RenderDeferred 1 1 RenderFastAlpha 1 1
RenderFastAlpha 1 1 RenderDeferred 1 1
RenderDeferredGI 1 1
RenderShadowDetail 1 2
RenderAvatarPhysicsLODFactor 1 1.0
// //
// Low Graphics Settings // Low Graphics Settings
@@ -70,7 +71,7 @@ RenderAvatarVP 1 0
RenderFarClip 1 64 RenderFarClip 1 64
RenderFlexTimeFactor 1 0.1 RenderFlexTimeFactor 1 0.1
RenderGlowResolutionPow 1 8 RenderGlowResolutionPow 1 8
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderMaxPartCount 1 1024 RenderMaxPartCount 1 1024
RenderObjectBump 1 0 RenderObjectBump 1 0
RenderReflectionDetail 1 0 RenderReflectionDetail 1 0
@@ -79,13 +80,15 @@ RenderTerrainLODFactor 1 1
RenderTreeLODFactor 1 0.25 RenderTreeLODFactor 1 0.25
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 0.5 RenderVolumeLODFactor 1 0.5
RenderWaterReflections 1 0
VertexShaderEnable 1 0 VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0 WindLightUseAtmosShaders 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 0 0 RenderUseFBO 0 0
RenderDeferred 0 0 RenderFastAlpha 1 1
RenderFastAlpha 0 0 RenderDeferred 0 0
RenderDeferredGI 0 0
RenderShadowDetail 0 0
RenderAvatarPhysicsLODFactor 1 0.0
// //
// Mid Graphics Settings // Mid Graphics Settings
@@ -98,7 +101,7 @@ RenderAvatarVP 1 1
RenderFarClip 1 96 RenderFarClip 1 96
RenderFlexTimeFactor 1 0.5 RenderFlexTimeFactor 1 0.5
RenderGlowResolutionPow 1 8 RenderGlowResolutionPow 1 8
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 0 RenderReflectionDetail 1 0
@@ -107,13 +110,15 @@ RenderTerrainLODFactor 1 1.0
RenderTreeLODFactor 1 0.5 RenderTreeLODFactor 1 0.5
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125 RenderVolumeLODFactor 1 1.125
RenderWaterReflections 1 0
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0 WindLightUseAtmosShaders 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderFastAlpha 1 0
RenderFastAlpha 1 0 RenderDeferred 1 0
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 0.5
// //
@@ -127,7 +132,7 @@ RenderAvatarVP 1 1
RenderFarClip 1 128 RenderFarClip 1 128
RenderFlexTimeFactor 1 1.0 RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 4096 RenderMaxPartCount 1 4096
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 2 RenderReflectionDetail 1 2
@@ -136,13 +141,15 @@ RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 0.5 RenderTreeLODFactor 1 0.5
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125 RenderVolumeLODFactor 1 1.125
RenderWaterReflections 1 0
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1 WindLightUseAtmosShaders 1 1
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderFastAlpha 1 0
RenderFastAlpha 1 0 RenderDeferred 1 0
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 0.75
// //
@@ -156,22 +163,24 @@ RenderAvatarVP 1 1
RenderFarClip 1 256 RenderFarClip 1 256
RenderFlexTimeFactor 1 1.0 RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 8192 RenderMaxPartCount 1 8192
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 3 RenderReflectionDetail 1 4
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0 RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 1.0 RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 2.0 RenderVolumeLODFactor 1 2.0
RenderWaterReflections 1 1
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1 WindLightUseAtmosShaders 1 1
WLSkyDetail 1 128 WLSkyDetail 1 128
RenderUseFBO 1 1 RenderUseFBO 1 1
RenderDeferred 1 1 RenderFastAlpha 1 0
RenderFastAlpha 1 1 RenderDeferred 1 1
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 1.0
// //
@@ -210,9 +219,10 @@ RenderVBOEnable 1 1
list NoPixelShaders list NoPixelShaders
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
VertexShaderEnable 0 0 VertexShaderEnable 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
// //
// No Vertex Shaders available // No Vertex Shaders available
@@ -220,9 +230,10 @@ WindLightUseAtmosShaders 0 0
list NoVertexShaders list NoVertexShaders
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
VertexShaderEnable 0 0 VertexShaderEnable 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
// "Default" setups for safe, low, medium, high // "Default" setups for safe, low, medium, high
// //
@@ -230,16 +241,16 @@ list safe
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderObjectBump 0 0 RenderObjectBump 0 0
RenderMaxPartCount 1 1024 RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0 RenderTerrainDetail 1 0
RenderUseImpostors 0 0 RenderUseImpostors 0 0
RenderVBOEnable 1 0 RenderVBOEnable 1 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderDeferred 1 0
// //
@@ -264,13 +275,14 @@ RenderVBOEnable 1 0
list Intel list Intel
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
// Avoid some Intel crashes on Linux // Avoid some Intel crashes on Linux
RenderCubeMap 0 0 RenderCubeMap 0 0
RenderDeferred 1 0
list GeForce2 list GeForce2
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderTerrainDetail 1 0 RenderTerrainDetail 1 0
RenderVBOEnable 1 1 RenderVBOEnable 1 1

82
indra/newview/featuretable_mac.txt
View File

@@ -34,18 +34,16 @@ RenderFogRatio 1 4.0
RenderGamma 1 0 RenderGamma 1 0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderGround 1 1 RenderGround 1 1
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 8192 RenderMaxPartCount 1 8192
RenderNightBrightness 1 1.0
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 3 RenderReflectionDetail 1 4
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0 RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 1.0 RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVBOEnable 1 1 RenderVBOEnable 1 1
RenderVolumeLODFactor 1 2.0 RenderVolumeLODFactor 1 2.0
RenderWaterReflections 1 1
UseStartScreen 1 1 UseStartScreen 1 1
UseOcclusion 1 1 UseOcclusion 1 1
VertexShaderEnable 1 1 VertexShaderEnable 1 1
@@ -55,9 +53,12 @@ Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1
RenderShaderLightingMaxLevel 1 3 RenderShaderLightingMaxLevel 1 3
RenderTextureMemoryMultiple 1 1.0 RenderTextureMemoryMultiple 1 1.0
RenderUseFBO 1 1 RenderUseFBO 1 1
RenderDeferred 1 1 RenderFastAlpha 1 1
RenderFastAlpha 1 1 RenderDeferred 1 1
RenderDeferredGI 1 1
RenderShadowDetail 1 2
RenderAvatarPhysicsLODFactor 1 1.0
// //
// Low Graphics Settings // Low Graphics Settings
@@ -70,7 +71,7 @@ RenderAvatarVP 1 0
RenderFarClip 1 64 RenderFarClip 1 64
RenderFlexTimeFactor 1 0.1 RenderFlexTimeFactor 1 0.1
RenderGlowResolutionPow 1 8 RenderGlowResolutionPow 1 8
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderMaxPartCount 1 1024 RenderMaxPartCount 1 1024
RenderObjectBump 1 0 RenderObjectBump 1 0
RenderReflectionDetail 1 0 RenderReflectionDetail 1 0
@@ -79,13 +80,15 @@ RenderTerrainLODFactor 1 1
RenderTreeLODFactor 1 0.25 RenderTreeLODFactor 1 0.25
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 0.5 RenderVolumeLODFactor 1 0.5
RenderWaterReflections 1 0
VertexShaderEnable 1 0 VertexShaderEnable 1 0
WindLightUseAtmosShaders 1 0 WindLightUseAtmosShaders 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 0 0 RenderUseFBO 0 0
RenderDeferred 0 0 RenderFastAlpha 1 1
RenderFastAlpha 0 0 RenderDeferred 0 0
RenderDeferredGI 0 0
RenderShadowDetail 0 0
RenderAvatarPhysicsLODFactor 1 0.0
// //
// Mid Graphics Settings // Mid Graphics Settings
@@ -98,7 +101,7 @@ RenderAvatarVP 1 1
RenderFarClip 1 96 RenderFarClip 1 96
RenderFlexTimeFactor 1 0.5 RenderFlexTimeFactor 1 0.5
RenderGlowResolutionPow 1 8 RenderGlowResolutionPow 1 8
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 0 RenderReflectionDetail 1 0
@@ -107,13 +110,15 @@ RenderTerrainLODFactor 1 1.0
RenderTreeLODFactor 1 0.5 RenderTreeLODFactor 1 0.5
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125 RenderVolumeLODFactor 1 1.125
RenderWaterReflections 1 0
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 0 WindLightUseAtmosShaders 1 0
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderFastAlpha 1 0
RenderFastAlpha 1 0 RenderDeferred 1 0
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 0.5
// //
@@ -127,7 +132,7 @@ RenderAvatarVP 1 1
RenderFarClip 1 128 RenderFarClip 1 128
RenderFlexTimeFactor 1 1.0 RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 4096 RenderMaxPartCount 1 4096
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 2 RenderReflectionDetail 1 2
@@ -136,13 +141,15 @@ RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 0.5 RenderTreeLODFactor 1 0.5
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 1.125 RenderVolumeLODFactor 1 1.125
RenderWaterReflections 1 0
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1 WindLightUseAtmosShaders 1 1
WLSkyDetail 1 48 WLSkyDetail 1 48
RenderUseFBO 1 0 RenderUseFBO 1 0
RenderDeferred 1 0 RenderFastAlpha 1 0
RenderFastAlpha 1 0 RenderDeferred 1 0
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 0.75
// //
@@ -156,22 +163,24 @@ RenderAvatarVP 1 1
RenderFarClip 1 256 RenderFarClip 1 256
RenderFlexTimeFactor 1 1.0 RenderFlexTimeFactor 1 1.0
RenderGlowResolutionPow 1 9 RenderGlowResolutionPow 1 9
RenderLightingDetail 1 1 RenderLocalLights 1 1
RenderMaxPartCount 1 8192 RenderMaxPartCount 1 8192
RenderObjectBump 1 1 RenderObjectBump 1 1
RenderReflectionDetail 1 3 RenderReflectionDetail 1 4
RenderTerrainDetail 1 1 RenderTerrainDetail 1 1
RenderTerrainLODFactor 1 2.0 RenderTerrainLODFactor 1 2.0
RenderTreeLODFactor 1 1.0 RenderTreeLODFactor 1 1.0
RenderUseImpostors 1 1 RenderUseImpostors 1 1
RenderVolumeLODFactor 1 2.0 RenderVolumeLODFactor 1 2.0
RenderWaterReflections 1 1
VertexShaderEnable 1 1 VertexShaderEnable 1 1
WindLightUseAtmosShaders 1 1 WindLightUseAtmosShaders 1 1
WLSkyDetail 1 128 WLSkyDetail 1 128
RenderUseFBO 1 1 RenderUseFBO 1 1
RenderDeferred 1 1 RenderFastAlpha 1 0
RenderFastAlpha 1 1 RenderDeferred 1 1
RenderDeferredGI 1 0
RenderShadowDetail 1 0
RenderAvatarPhysicsLODFactor 1 1.0
// //
// Class Unknown Hardware (unknown) // Class Unknown Hardware (unknown)
@@ -209,9 +218,10 @@ RenderVBOEnable 1 1
list NoPixelShaders list NoPixelShaders
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
VertexShaderEnable 0 0 VertexShaderEnable 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
// //
// No Vertex Shaders available // No Vertex Shaders available
@@ -219,9 +229,10 @@ WindLightUseAtmosShaders 0 0
list NoVertexShaders list NoVertexShaders
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
VertexShaderEnable 0 0 VertexShaderEnable 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderDeferred 0 0
// "Default" setups for safe, low, medium, high // "Default" setups for safe, low, medium, high
// //
@@ -229,14 +240,16 @@ list safe
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderAvatarCloth 0 0 RenderAvatarCloth 0 0
RenderAvatarVP 0 0 RenderAvatarVP 0 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderObjectBump 0 0 RenderObjectBump 0 0
RenderMaxPartCount 1 1024 RenderMaxPartCount 1 1024
RenderTerrainDetail 1 0 RenderTerrainDetail 1 0
RenderUseImpostors 0 0 RenderUseImpostors 0 0
RenderVBOEnable 1 0 RenderVBOEnable 1 0
RenderWaterReflections 0 0 RenderReflectionDetail 0 0
WindLightUseAtmosShaders 0 0 WindLightUseAtmosShaders 0 0
RenderUseFBO 1 0
RenderDeferred 1 0
// //
// CPU based feature masks // CPU based feature masks
@@ -260,11 +273,12 @@ RenderVBOEnable 1 0
list Intel list Intel
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderDeferred 1 0
list GeForce2 list GeForce2
RenderAnisotropic 1 0 RenderAnisotropic 1 0
RenderLightingDetail 1 0 RenderLocalLights 1 0
RenderMaxPartCount 1 2048 RenderMaxPartCount 1 2048
RenderTerrainDetail 1 0 RenderTerrainDetail 1 0
RenderVBOEnable 1 1 RenderVBOEnable 1 1

4
indra/newview/llpaneldisplay.cpp
View File

@@ -342,6 +342,7 @@ BOOL LLPanelDisplay::postBuild()
mTerrainText = getChild<LLTextBox>("TerrainDetailText"); mTerrainText = getChild<LLTextBox>("TerrainDetailText");
mLightingText = getChild<LLTextBox>("LightingDetailText"); mLightingText = getChild<LLTextBox>("LightingDetailText");
mMeshDetailText = getChild<LLTextBox>("MeshDetailText"); mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
mShadowDetailText = getChild<LLTextBox>("ShadowDetailText");
refresh(); refresh();
@@ -585,7 +586,7 @@ void LLPanelDisplay::disableUnavailableSettings()
} }
// disabled reflections // disabled reflections
if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderWaterReflections")) if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderReflectionDetail"))
{ {
mCtrlReflectionDetail->setEnabled(FALSE); mCtrlReflectionDetail->setEnabled(FALSE);
mCtrlReflectionDetail->setValue(FALSE); mCtrlReflectionDetail->setValue(FALSE);
@@ -720,6 +721,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
mTerrainText->setVisible(!isHidden); mTerrainText->setVisible(!isHidden);
mDrawDistanceMeterText1->setVisible(!isHidden); mDrawDistanceMeterText1->setVisible(!isHidden);
mDrawDistanceMeterText2->setVisible(!isHidden); mDrawDistanceMeterText2->setVisible(!isHidden);
mShadowDetailText->setVisible(!isHidden);
// hide one meter text if we're making things visible // hide one meter text if we're making things visible
if(!isHidden) if(!isHidden)

1
indra/newview/llpaneldisplay.h
View File

@@ -141,6 +141,7 @@ protected:
LLTextBox *mTerrainFactorText; LLTextBox *mTerrainFactorText;
LLTextBox *mSkyFactorText; LLTextBox *mSkyFactorText;
LLTextBox *mPostProcessText; LLTextBox *mPostProcessText;
LLTextBox *mShadowDetailText;
BOOL mFSAutoDetectAspect; BOOL mFSAutoDetectAspect;
F32 mAspectRatio; F32 mAspectRatio;