From 2322c57b4dd2b4338eec2ca9db2425eff4bfd6d5 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 11 Oct 2011 14:55:33 -0500 Subject: SH-2545 Fix for transparent water option doing nothing when shaders are enabled. --- indra/llrender/llglslshader.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/llrender/llglslshader.cpp') 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) { -- cgit v1.2.3