diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-11 14:55:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-11 14:55:33 -0500 |
| commit | 2322c57b4dd2b4338eec2ca9db2425eff4bfd6d5 (patch) | |
| tree | d237bc15606a154db8cede7d83cda3802d46d7a0 /indra/llrender | |
| parent | 3211c6e3089b03d73f2e260be4037304660f834d (diff) | |
SH-2545 Fix for transparent water option doing nothing when shaders are enabled.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index bbb62ea3c1..deb022fd75 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -762,12 +762,8 @@ void LLGLSLShader::uniformMatrix4fv(U32 index, U32 count, GLboolean transpose, c } } -static LLFastTimer::DeclareTimer FTM_UNIFORM_LOCATION("Get Uniform Location"); - GLint LLGLSLShader::getUniformLocation(const string& uniform) { - LLFastTimer t(FTM_UNIFORM_LOCATION); - GLint ret = -1; if (mProgramObject > 0) { @@ -792,8 +788,6 @@ GLint LLGLSLShader::getUniformLocation(const string& uniform) GLint LLGLSLShader::getUniformLocation(U32 index) { - LLFastTimer t(FTM_UNIFORM_LOCATION); - GLint ret = -1; if (mProgramObject > 0) { |