diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-15 14:29:46 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-15 14:29:46 -0500 |
commit | 99dc246ac843114f20f7aa99531451fcf46df3ed (patch) | |
tree | d94a0a31e00c53ea359d9939d1928180d398b334 /indra/llrender/llglslshader.cpp | |
parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
parent | d76715776bb9e26577c4e505745eb2773e8a4796 (diff) |
Merge
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) { |