diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-10-10 13:56:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-10-10 13:56:06 -0500 |
| commit | ff8b002c3b2bc68bdf4b88c1687a711d2d7c0ca6 (patch) | |
| tree | 32397148f0966e461bdab303e41b196f1382f5c4 /indra/llrender/llshadermgr.h | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
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); |