aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llglslshader.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llglslshader.h')
-rw-r--r--linden/indra/llrender/llglslshader.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/llrender/llglslshader.h b/linden/indra/llrender/llglslshader.h
index 0fa8e41..66c53df 100644
--- a/linden/indra/llrender/llglslshader.h
+++ b/linden/indra/llrender/llglslshader.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$ 5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2001-2008, Linden Research, Inc. 7 * Copyright (c) 2001-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
@@ -33,6 +33,7 @@
33#define LL_LLGLSLSHADER_H 33#define LL_LLGLSLSHADER_H
34 34
35#include "llgl.h" 35#include "llgl.h"
36#include "llrender.h"
36 37
37class LLShaderFeatures 38class LLShaderFeatures
38{ 39{
@@ -111,8 +112,8 @@ public:
111 //if given texture uniform is active in the shader, 112 //if given texture uniform is active in the shader,
112 //the corresponding channel will be active upon return 113 //the corresponding channel will be active upon return
113 //returns channel texture is enabled in from [0-MAX) 114 //returns channel texture is enabled in from [0-MAX)
114 S32 enableTexture(S32 uniform, S32 mode = GL_TEXTURE_2D); 115 S32 enableTexture(S32 uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE);
115 S32 disableTexture(S32 uniform, S32 mode = GL_TEXTURE_2D); 116 S32 disableTexture(S32 uniform, LLTexUnit::eTextureType mode = LLTexUnit::TT_TEXTURE);
116 117
117 BOOL link(BOOL suppress_errors = FALSE); 118 BOOL link(BOOL suppress_errors = FALSE);
118 void bind(); 119 void bind();