diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
tree | 5da5b829085d2a19422ce1f2f987b395080369cc /indra/newview/featuretable_xp.txt | |
parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) |
merge latest viewer-development
Diffstat (limited to 'indra/newview/featuretable_xp.txt')
-rw-r--r-- | indra/newview/featuretable_xp.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt index 9b9e1f6ead..a69fd4fdaf 100644 --- a/indra/newview/featuretable_xp.txt +++ b/indra/newview/featuretable_xp.txt @@ -1,4 +1,4 @@ -version 27 +version 29 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table @@ -48,6 +48,7 @@ RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 +RenderVBOMappingDisable 1 1 RenderVolumeLODFactor 1 2.0 UseStartScreen 1 1 UseOcclusion 1 1 @@ -63,6 +64,7 @@ RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 +RenderFSAASamples 1 16 // // Low Graphics Settings @@ -93,6 +95,7 @@ WLSkyDetail 1 48 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 +RenderFSAASamples 1 0 // // Mid Graphics Settings @@ -122,6 +125,7 @@ WLSkyDetail 1 48 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 +RenderFSAASamples 1 0 // // High Graphics Settings (purty) @@ -151,6 +155,7 @@ WLSkyDetail 1 48 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 2 +RenderFSAASamples 1 4 // // Ultra graphics (REALLY PURTY!) @@ -180,6 +185,7 @@ WLSkyDetail 1 128 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 2 +RenderFSAASamples 1 8 // // Class Unknown Hardware (unknown) @@ -238,6 +244,13 @@ RenderDeferredSSAO 0 0 RenderShadowDetail 0 0 // +// No GL_ARB_map_buffer_range +// +list NoMapBufferRange +RenderVBOMappingDisable 1 0 + + +// // "Default" setups for safe, low, medium, high // list safe @@ -464,7 +477,6 @@ RenderAvatarCloth 0 0 list ATI RenderUseStreamVBO 1 0 -RenderAvatarVP 1 0 // Disable vertex buffer objects by default for ATI cards with little video memory list ATIVramLT256 |