diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-02-12 14:31:37 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-02-12 14:31:37 -0800 |
| commit | 7c3e51b05cfe8757bc72a8b5c19eff307b1e501f (patch) | |
| tree | 8c3b36a820d7ea3eae7d0bb7bc544f8548986f02 /indra/llrender/llshadermgr.h | |
| parent | 8b690a3fdfb24aea23150031768e0734043195aa (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge with 3.7.0
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rwxr-xr-x | indra/llrender/llshadermgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index 51c27fc8b6..394b38f832 100755 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -176,6 +176,7 @@ public: ENVIRONMENT_INTENSITY, AVATAR_MATRIX, + AVATAR_TRANSLATION, WATER_SCREENTEX, WATER_SCREENDEPTH, @@ -224,7 +225,7 @@ DISPLAY_GAMMA, virtual void initAttribsAndUniforms(void); BOOL attachShaderFeatures(LLGLSLShader * shader); - void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE); + void dumpObjectLog(GLhandleARB ret, BOOL warns = TRUE, const std::string& filename = ""); BOOL linkProgramObject(GLhandleARB obj, BOOL suppress_errors = FALSE); BOOL validateProgramObject(GLhandleARB obj); GLhandleARB loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string>* defines = NULL, S32 texture_index_channels = -1); |