summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-11-15 08:11:05 -0800
committerGraham Linden <graham@lindenlab.com>2018-11-15 08:11:05 -0800
commit429bef3cf6361c10c99418d419939279747ceb24 (patch)
tree938e97a8fa15f00312a15a2009d6a4965329bad1 /indra/llrender
parentc4630a4b15c6297ae669a2030b8fbc4a1490cee4 (diff)
Remove compilation and linkage of deferredUtil and indirect GLSL helper objects (current source of Intel ig4icd driver crash).
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llshadermgr.cpp2
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)
{