diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-16 00:31:39 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-16 00:31:39 +0100 |
| commit | 3237923e10a34d14ac4aac17400811cb1c7c3bdf (patch) | |
| tree | 94815c2fd75507f0cee47562af427a4426e86e69 /indra/llrender/llshadermgr.cpp | |
| parent | 3983f5b1e2d79602a7d685633271d824a906ed2f (diff) | |
MAINT-3699 new shaders supporting alpha blend/mask rigged content.
Make shader loading debug logging of uniforms use ShaderUniform to make supression simpler.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index e721ad93fa..643c368870 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -537,8 +537,6 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade } } - LL_DEBUGS("ShaderLoading") << "Loading shader file: " << filename << " class " << shader_level << LL_ENDL; - if (filename.empty()) { return 0; @@ -558,7 +556,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade fname << getShaderDirPrefix(); fname << gpu_class << "/" << filename; - LL_DEBUGS("ShaderLoading") << "Looking in " << fname.str() << LL_ENDL; + file = LLFile::fopen(fname.str(), "r"); /* Flawfinder: ignore */ if (file) { |