diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-28 09:24:58 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-28 09:24:58 -0700 |
| commit | 1eda16b31989448a211808a8144f0a5ffb0bce49 (patch) | |
| tree | 27333cfb8cdaf28b69e579a87a6f3c321065bafc /indra/llrender | |
| parent | 438d97714778ebb8728f0ac3808f0b8f98afc1fa (diff) | |
| parent | 0ff65651cc219eef959c5e961663de2a07595e5a (diff) | |
Merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 0e79430468..78aed5eef6 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -35,11 +35,7 @@ #include "OpenGL/OpenGL.h" #endif -#ifdef LL_RELEASE_FOR_DOWNLOAD #define UNIFORM_ERRS LL_WARNS_ONCE("Shader") -#else -#define UNIFORM_ERRS LL_ERRS("Shader") -#endif // Lots of STL stuff in here, using namespace std to keep things more readable using std::vector; @@ -559,6 +555,15 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string& GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type, boost::unordered_map<std::string, std::string>* defines, S32 texture_index_channels) { + +// endsure work-around for missing GLSL funcs gets propogated to feature shader files (e.g. srgbF.glsl) +#if LL_DARWIN + if (defines) + { + (*defines)["OLD_SELECT"] = "1"; + } +#endif + GLenum error = GL_NO_ERROR; if (gDebugGL) { |