diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-26 18:31:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 18:31:55 -0500 |
| commit | 54ba56dbe995a3d215f85932c83948145a871ac4 (patch) | |
| tree | c6162c3b56599db1b21f707e1c8b0b6f04a85064 /indra/llrender/llgl.cpp | |
| parent | 56191701bcbc0ef1b6872cc6bfac1d18f636fd12 (diff) | |
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |