diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-20 11:00:18 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-20 11:00:18 -0800 |
| commit | 6c8eebf76209489010694a4e0af8d911e9606498 (patch) | |
| tree | de1b57f8f97d184cc64a837c22cc7b355949af16 /indra/llrender | |
| parent | 29130c5483146d4d27272ef12e986520778ca2c8 (diff) | |
| parent | db424c0de3e3803155f0c18376466e8e57beba58 (diff) | |
Merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index ae91567334..3a80ff0144 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -196,6 +196,7 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) } } +#if USE_DEFERRED_SHADER_API if (features->isDeferred || features->hasShadows) { if (!shader->attachObject("deferred/deferredUtil.glsl")) @@ -211,6 +212,7 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) return FALSE; } } +#endif if (features->hasGamma) { |