diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-31 14:42:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-31 14:42:17 -0500 |
| commit | 9da4007f85912330a70bc87bfb97cbcf1033e3ab (patch) | |
| tree | 08f94effb0e9ccd8f17bc214f53e62a14a51b405 /indra/llrender/llgl.cpp | |
| parent | fa76b8992c6c636303d398bd25d34c39ae23419e (diff) | |
| parent | ece32418e7c1828a65c88e526a5afcb635c5453a (diff) | |
merge
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 96b1838158..a8d7df3bc8 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -551,7 +551,7 @@ bool LLGLManager::initGL() { GLint num_tex_image_units; glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &num_tex_image_units); - mNumTextureImageUnits = num_tex_image_units; + mNumTextureImageUnits = llmin(num_tex_image_units, 32); } if (mHasTextureMultisample) @@ -1516,6 +1516,7 @@ void LLGLState::checkTextureChannels(const std::string& msg) } } + stop_glerror(); gGL.getTexUnit(0)->activate(); glClientActiveTextureARB(GL_TEXTURE0_ARB); stop_glerror(); |