From 54ba56dbe995a3d215f85932c83948145a871ac4 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 26 Sep 2011 18:31:55 -0500
Subject: SH-2244 changes to run in a core context on AMD hardware without
 generating deprecation or performance warnings

---
 indra/llrender/llgl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llrender/llgl.cpp')

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 59c63d8465..189a460001 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -650,7 +650,7 @@ bool LLGLManager::initGL()
 
 	if (LLRender::sGLCoreProfile)
 	{
-		mNumTextureUnits = mNumTextureImageUnits;
+		mNumTextureUnits = llmin(mNumTextureImageUnits, MAX_GL_TEXTURE_UNITS);
 	}
 	else if (mHasMultitexture)
 	{
-- 
cgit v1.2.3