diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:31:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:31:01 -0500 |
| commit | 1d30fe955442855dd3102a006d6e4120d2f416b4 (patch) | |
| tree | 1783c0818fb473e1bd8a5ed7a4622f45e30fc99d /indra/llrender/llshadermgr.h | |
| parent | 9b42503379bc2e9698545543670306961f7db991 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-release
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); |