From 429bef3cf6361c10c99418d419939279747ceb24 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 15 Nov 2018 08:11:05 -0800
Subject: Remove compilation and linkage of deferredUtil and indirect GLSL
 helper objects (current source of Intel ig4icd driver crash).

---
 indra/llrender/llshadermgr.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llrender')

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)
 	{
-- 
cgit v1.2.3