diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-18 20:26:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-18 20:26:24 -0400 |
| commit | 1991d95e852b3798ab3e41706525c843dd54914a (patch) | |
| tree | 30f72efa8bc54c6466b91fd4ad97c6af60c68c31 /indra/llrender/llshadermgr.h | |
| parent | ae127dc01ab10d407cf165ae2ad74060f65c1832 (diff) | |
| parent | 72af85ffbd1c4d4dd44acf7bf65fe55b4851d01b (diff) | |
merge updates from Geenz
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 7a16b7c20f..4b93aae735 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -176,7 +176,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, S32 texture_index_channels = -1); + GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string> defines, S32 texture_index_channels = -1); // Implemented in the application to actually point to the shader directory. virtual std::string getShaderDirPrefix(void) = 0; // Pure Virtual |