diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-19 20:42:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-19 20:42:56 -0500 |
| commit | fd574e34857accd55e736d855975767fd7768b79 (patch) | |
| tree | dab0a3f4ab660d757c9d25ee4a37a482c3b036a2 /indra/llrender/llglslshader.cpp | |
| parent | 19a06478d9863c451450b7c9e2f931ba587a3cec (diff) | |
| parent | 51bb3c15c8ac6c85ed1a7e8526ba6b60794ac29e (diff) | |
merge
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 257bcd9380..2e7147a3b4 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -293,7 +293,8 @@ void LLGLSLShader::mapUniform(GLint index, const vector<string> * uniforms) GLint LLGLSLShader::mapUniformTextureChannel(GLint location, GLenum type) { - if (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB) + if (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB || + type == GL_SAMPLER_2D_MULTISAMPLE) { //this here is a texture glUniform1iARB(location, mActiveTextureChannels); LL_DEBUGS("ShaderLoading") << "Assigned to texture channel " << mActiveTextureChannels << LL_ENDL; |