diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
| commit | 662a92784328f31b680f4f049350dd0f6cacf4c7 (patch) | |
| tree | 81c6c9634d919941e683f5d2e3ca0dd8c0c655cd /indra/llrender/llglslshader.cpp | |
| parent | 6be68618c4b32082228d9c34083542017b84482f (diff) | |
| parent | 7a85df942916b8387fd822a9e22cb0857c258be5 (diff) | |
merge changes for shining branch
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 8e99f62de6..ad2c662dfc 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -109,6 +109,11 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, // Create program mProgramObject = glCreateProgramObjectARB(); + if (gGLManager.mGLVersion < 3.1f) + { //force indexed texture channels to 1 if GL version is old (performance improvement for drivers with poor branching shader model support) + mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1); + } + //compile new source vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin(); for ( ; fileIter != mShaderFiles.end(); fileIter++ ) @@ -131,6 +136,11 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, return FALSE; } + if (gGLManager.mGLVersion < 3.1f) + { //attachShaderFeatures may have set the number of indexed texture channels, so set to 1 again + mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1); + } + // Map attributes and uniforms if (success) { |