summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-02-22 00:35:24 +0000
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-02-22 00:35:24 +0000
commit6cc4a091b3ba4dd4842cc06e3b34af3d04dc5796 (patch)
tree8271d921ec27ee11ed2e807c3427ac0befcc8971 /indra/newview/llviewershadermgr.cpp
parent99b82d944937ce321f64aa91fb18ab2aedd3992a (diff)
Add settings/validations for new advanced atmo settings.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r--indra/newview/llviewershadermgr.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index bec05fa263..6d174442fb 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -3308,7 +3308,7 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
}
// this shader uses gather so it can't live with the other basic shaders safely
- if (success)
+ if (success && (mVertexShaderLevel[SHADER_WINDLIGHT] >= 3))
{
gDownsampleMinMaxDepthRectProgram.mName = "DownsampleMinMaxDepthRect Shader";
gDownsampleMinMaxDepthRectProgram.mShaderFiles.clear();
@@ -3331,8 +3331,6 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
success = gInscatterRectProgram.createShader(NULL, NULL);
}
- llassert(success);
-
if (success)
{
gWLSkyProgram.mName = "Windlight Sky Shader";
@@ -3349,8 +3347,6 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
success = gWLSkyProgram.createShader(NULL, NULL);
}
- llassert(success);
-
if (success && (mVertexShaderLevel[SHADER_WINDLIGHT] < 3))
{
gWLCloudProgram.mName = "Windlight Cloud Program";