diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-07-30 11:33:58 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-07-30 11:33:58 -0700 |
| commit | f86a7c04d3c265f4d61d99d1d7fdb7e35c4bc3f6 (patch) | |
| tree | 18ba9843873b40d75ab1e9d1a159abd4d1814719 /indra/llrender/llglslshader.cpp | |
| parent | b44e7303d85ffc59afe34a97342d83a04b180c48 (diff) | |
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rwxr-xr-x | indra/llrender/llglslshader.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index b854218e3d..40aff36dac 100755 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -87,7 +87,6 @@ LLShaderFeatures::LLShaderFeatures() , mIndexedTextureChannels(0) , disableTextureIndex(false) , hasAlphaMask(false) - , hasSRGB(false) { } @@ -375,6 +374,11 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, // Create program mProgramObject = glCreateProgramObjectARB(); + +#if LL_DARWIN + // work-around missing mix(vec3,vec3,bvec3) + mDefines["OLD_SELECT"] = "1"; +#endif //compile new source vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin(); |