aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llglslshader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llglslshader.cpp')
-rw-r--r--linden/indra/llrender/llglslshader.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llrender/llglslshader.cpp b/linden/indra/llrender/llglslshader.cpp
index 26984e1..6683916 100644
--- a/linden/indra/llrender/llglslshader.cpp
+++ b/linden/indra/llrender/llglslshader.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2005&license=viewergpl$ 5 * $LicenseInfo:firstyear=2005&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2005-2008, Linden Research, Inc. 7 * Copyright (c) 2005-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -365,7 +365,7 @@ void LLGLSLShader::bindNoShader(void)
365 glUseProgramObjectARB(0); 365 glUseProgramObjectARB(0);
366} 366}
367 367
368S32 LLGLSLShader::enableTexture(S32 uniform, S32 mode) 368S32 LLGLSLShader::enableTexture(S32 uniform, LLTexUnit::eTextureType mode)
369{ 369{
370 if (uniform < 0 || uniform >= (S32)mTexture.size()) 370 if (uniform < 0 || uniform >= (S32)mTexture.size())
371 { 371 {
@@ -376,12 +376,12 @@ S32 LLGLSLShader::enableTexture(S32 uniform, S32 mode)
376 if (index != -1) 376 if (index != -1)
377 { 377 {
378 gGL.getTexUnit(index)->activate(); 378 gGL.getTexUnit(index)->activate();
379 glEnable(mode); 379 gGL.getTexUnit(index)->enable(mode);
380 } 380 }
381 return index; 381 return index;
382} 382}
383 383
384S32 LLGLSLShader::disableTexture(S32 uniform, S32 mode) 384S32 LLGLSLShader::disableTexture(S32 uniform, LLTexUnit::eTextureType mode)
385{ 385{
386 if (uniform < 0 || uniform >= (S32)mTexture.size()) 386 if (uniform < 0 || uniform >= (S32)mTexture.size())
387 { 387 {
@@ -392,7 +392,7 @@ S32 LLGLSLShader::disableTexture(S32 uniform, S32 mode)
392 if (index != -1) 392 if (index != -1)
393 { 393 {
394 gGL.getTexUnit(index)->activate(); 394 gGL.getTexUnit(index)->activate();
395 glDisable(mode); 395 gGL.getTexUnit(index)->disable();
396 } 396 }
397 return index; 397 return index;
398} 398}