diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:08:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:08:20 -0500 |
| commit | dfbc6c65f665f5c550581b77aeb7c308181fd8d8 (patch) | |
| tree | e31a72c55ad0aa01728b90c861e2b91aa8c6b53b /indra/llrender/llglslshader.cpp | |
| parent | 831251785762897a72da2b4dc9fb62731491fe4d (diff) | |
| parent | 254728e00d600bdb4b211d9fd4b7da33e3872fea (diff) | |
merge changes for open-203
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rwxr-xr-x | indra/llrender/llglslshader.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 35620bb656..1c50a51d02 100755 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -717,7 +717,14 @@ BOOL LLGLSLShader::mapUniforms(const vector<LLStaticHashedString> * uniforms) BOOL LLGLSLShader::link(BOOL suppress_errors) { - return LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors); + BOOL success = LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors); + + if (!suppress_errors) + { + LLShaderMgr::instance()->dumpObjectLog(mProgramObject, !success, mName); + } + + return success; } void LLGLSLShader::bind() |