diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
commit | 76876538715e3afbe456e2bf84173bde416d50e6 (patch) | |
tree | 423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/newview/featuretable.txt | |
parent | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff) | |
parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/featuretable.txt')
-rw-r--r-- | indra/newview/featuretable.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 8b20086af4..f4fb2c8a89 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -62,6 +62,7 @@ RenderShadowDetail 1 2 RenderUseFBO 1 1 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 +RenderUseFBO 1 1 // // Low Graphics Settings @@ -90,7 +91,7 @@ SkyUseClassicClouds 1 0 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 - +RenderUseFBO 1 0 // // Mid Graphics Settings @@ -117,7 +118,7 @@ WLSkyDetail 1 48 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 - +RenderUseFBO 1 0 // // High Graphics Settings (purty) @@ -144,7 +145,7 @@ WLSkyDetail 1 48 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 - +RenderUseFBO 1 1 // // Ultra graphics (REALLY PURTY!) @@ -171,7 +172,7 @@ WLSkyDetail 1 128 RenderDeferred 1 1 RenderDeferredSSAO 1 1 RenderShadowDetail 1 2 - +RenderUseFBO 1 1 // // Class Unknown Hardware (unknown) @@ -247,7 +248,8 @@ WindLightUseAtmosShaders 0 0 RenderDeferred 0 0 RenderDeferredSSAO 0 0 RenderShadowDetail 0 0 - +RenderUseFBO 1 0 + // // CPU based feature masks |