diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 11:45:43 -0400 |
| commit | 13de92740e55e8ba5111e1cd16e239ebeda3a578 (patch) | |
| tree | 5da5b829085d2a19422ce1f2f987b395080369cc /indra/llrender/llshadermgr.h | |
| parent | ab431d1774d5b282836a3327dd0bfa8b3b91632b (diff) | |
| parent | 9a2e35f7cab1ba119e9887cd307f021fc6ae0bd5 (diff) | |
merge latest viewer-development
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rw-r--r-- | indra/llrender/llshadermgr.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index c54c4608d7..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 @@ -60,6 +60,9 @@ public: std::vector<std::string> mReservedUniforms; + //preprocessor definitions (name/value) + std::map<std::string, std::string> mDefinitions; + protected: // our parameter manager singleton instance |