diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
| commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
| tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/llrender/llglslshader.cpp | |
| parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
| parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) | |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 4b7e639aed..7cbf39096e 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -129,7 +129,9 @@ void LLGLSLShader::unload() } BOOL LLGLSLShader::createShader(vector<string> * attributes, - vector<string> * uniforms) + vector<string> * uniforms, + U32 varying_count, + const char** varyings) { //reloading, reset matrix hash values for (U32 i = 0; i < LLRender::NUM_MATRIX_MODES; ++i) @@ -172,6 +174,13 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1); } +#ifdef GL_INTERLEAVED_ATTRIBS + if (varying_count > 0 && varyings) + { + glTransformFeedbackVaryings(mProgramObject, varying_count, varyings, GL_INTERLEAVED_ATTRIBS); + } +#endif + // Map attributes and uniforms if (success) { |