diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-16 00:58:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-16 00:58:16 -0500 |
| commit | b32e6e094d1a6d2843b938448eee22ad1671052c (patch) | |
| tree | 44e1f2cb549aa5a04189b997407719cd30eec68d | |
| parent | 984feefbecd0338618ea499dc1fa44c5a5fe747d (diff) | |
SH-2276 Fix for TDR's on GTX 460 et al -- don't use texture units above 16 (workaround for prevalent driver bug)
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/featuretable.txt | 3 | ||||
| -rw-r--r-- | indra/newview/featuretable_linux.txt | 1 | ||||
| -rw-r--r-- | indra/newview/featuretable_mac.txt | 1 | ||||
| -rw-r--r-- | indra/newview/featuretable_xp.txt | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e7ff584b38..6567ad5e04 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7796,7 +7796,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>32</integer> + <integer>16</integer> </map> <key>RenderDebugTextureBind</key> <map> diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 22d76cb082..51065aacba 100755 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -65,7 +65,8 @@ RenderShadowDetail 1 2 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 RenderFSAASamples 1 16 -RenderMaxTextureIndex 1 32 +RenderMaxTextureIndex 1 16 + // // Low Graphics Settings diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 18efcf5665..2c29c3003e 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -63,6 +63,7 @@ RenderDeferred 1 1 RenderDeferredSSAO 1 1 RenderShadowDetail 1 2 RenderFSAASamples 1 16 +RenderMaxTextureIndex 1 16 // // Low Graphics Settings diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index c37e4e93ee..e2c35adaf1 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -65,6 +65,7 @@ RenderShadowDetail 1 2 WatchdogDisabled 1 1 RenderUseStreamVBO 1 0 RenderFSAASamples 1 16 +RenderMaxTextureIndex 1 16 // // Low Graphics Settings diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt index a8e13ce65c..4b6f86665e 100644 --- a/indra/newview/featuretable_xp.txt +++ b/indra/newview/featuretable_xp.txt @@ -65,7 +65,7 @@ RenderShadowDetail 1 0 WatchdogDisabled 1 1 RenderUseStreamVBO 1 1 RenderFSAASamples 1 16 -RenderMaxTextureIndex 1 32 +RenderMaxTextureIndex 1 16 // // Low Graphics Settings |