diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-31 14:42:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-31 14:42:17 -0500 |
| commit | 9da4007f85912330a70bc87bfb97cbcf1033e3ab (patch) | |
| tree | 08f94effb0e9ccd8f17bc214f53e62a14a51b405 /indra/llrender/llshadermgr.h | |
| parent | fa76b8992c6c636303d398bd25d34c39ae23419e (diff) | |
| parent | ece32418e7c1828a65c88e526a5afcb635c5453a (diff) | |
merge
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 9ee11b98c8..2f30103811 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -43,7 +43,7 @@ public: void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE); BOOL linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE); BOOL validateProgramObject(GLhandleARB obj); - GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type); + GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, S32 texture_index_channels = -1); // Implemented in the application to actually point to the shader directory. virtual std::string getShaderDirPrefix(void) = 0; // Pure Virtual |