From b32e6e094d1a6d2843b938448eee22ad1671052c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Sun, 16 Oct 2011 00:58:16 -0500
Subject: [PATCH] SH-2276 Fix for TDR's on GTX 460 et al -- don't use texture
units above 16 (workaround for prevalent driver bug)
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/featuretable.txt | 3 ++-
indra/newview/featuretable_linux.txt | 1 +
indra/newview/featuretable_mac.txt | 1 +
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 e7ff584b385..6567ad5e043 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 22d76cb0827..51065aacbac 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 18efcf5665e..2c29c3003ec 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 c37e4e93ee9..e2c35adaf16 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 a8e13ce65c2..4b6f86665ea 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
--
GitLab