diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-24 13:10:26 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-24 13:10:26 -0500 |
| commit | f5b10238aff1fe0332ed0253d2fbb07be54acd14 (patch) | |
| tree | b175ce5d793a4f937e04c42949a99045bee58301 | |
| parent | 51ba2f5fbc379f58d64f8850cd438cc95d7b89f7 (diff) | |
SH-2240 Forcibly disable shaders on hardware that's specifically flagged as unsupported.
| -rw-r--r-- | indra/newview/gpu_table.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index 198e702459..bb85551205 100644 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -367,7 +367,7 @@ NVIDIA GTX 550 .*NVIDIA .*GTX *55.* 3 1 NVIDIA GTX 560 .*NVIDIA .*GTX *56.* 3 1 NVIDIA GTX 570 .*NVIDIA .*GTX *57.* 3 1 NVIDIA GTX 580M .*NVIDIA .*GTX *580M.* 3 1 -NVIDIA GTX 580 .*NVIDIA .*GTX *58.* 3 1 +NVIDIA GTX 580 .*NVIDIA .*GTX *58.* 3 0 NVIDIA GTX 590 .*NVIDIA .*GTX *59.* 3 1 NVIDIA C51 .*NVIDIA .*C51.* 0 1 NVIDIA G72 .*NVIDIA .*G72.* 1 1 diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index eb0cdf28c0..08f9d26705 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -731,7 +731,7 @@ void LLFeatureManager::applyBaseMasks() { maskFeatures("NoPixelShaders"); } - if (!gGLManager.mHasVertexShader) + if (!gGLManager.mHasVertexShader || !mGPUSupported) { maskFeatures("NoVertexShaders"); } |