diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-26 23:31:03 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-26 23:31:03 +0100 |
| commit | 71a0d3e9597415a86185d7683710252326da7b7a (patch) | |
| tree | aaabe2bdfac18159803f47acf6a8857bbb6f5c16 /indra/llrender | |
| parent | 3cd2a35f9db411616ad15b89c8af366c0ccf00c9 (diff) | |
Fix OSX bug from OLD_SELECT GLSL work-around define not being used with automatically linked feature shaders.
Add LL_RELEASE_FOR_DOWNLOAD ifdef around launcher nag.
Fix OSX 10.14 SDK compile issue from unused var in scroll list.
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) { |