diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-05-21 23:33:25 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-05-21 23:33:25 -0500 | 
| commit | b7cfd8c7f09a1a913c5678a5a25a951307593eb3 (patch) | |
| tree | 0231b52789d1054c397dddd8da41cc498181dd90 /indra/newview/app_settings | |
| parent | 89b0b6ac7198653d989dea78ee1c3d3f4f61161f (diff) | |
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 27 | 
1 files changed, 25 insertions, 2 deletions
| diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index bd109120cf..8cb456b4fd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9162,7 +9162,7 @@      <key>RenderUseVAO</key>      <map>        <key>Comment</key> -      <string>Use GL Vertex Array Objects</string> +      <string>[EXPERIMENTAL] Use GL Vertex Array Objects</string>        <key>Persist</key>        <integer>1</integer>        <key>Type</key> @@ -9170,7 +9170,19 @@        <key>Value</key>        <integer>0</integer>      </map> -    <key>RenderVBOMappingDisable</key> +  <key>RenderUseTransformFeedback</key> +  <map> +    <key>Comment</key> +    <string>[EXPERIMENTAL] Use transform feedback shaders for LoD updates</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>Boolean</string> +    <key>Value</key> +    <integer>0</integer> +  </map> + +  <key>RenderVBOMappingDisable</key>      <map>        <key>Comment</key>        <string>Disable VBO glMapBufferARB</string> @@ -12140,6 +12152,17 @@        <key>Value</key>        <integer>1</integer>      </map> +  <key>RenderSynchronousOcclusion</key> +  <map> +    <key>Comment</key> +    <string>Don't let occlusion queries get more than one frame behind (block until they complete).</string> +    <key>Persist</key> +    <integer>1</integer> +    <key>Type</key> +    <string>Boolean</string> +    <key>Value</key> +    <integer>1</integer> +  </map>      <key>RenderDelayVBUpdate</key>      <map>        <key>Comment</key> | 
