diff options
author | Dave Parks <davep@lindenlab.com> | 2012-05-21 23:34:51 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-05-21 23:34:51 -0500 |
commit | 336b12e803fdc5f34b5394eae50645870d664d13 (patch) | |
tree | d922b43194da6e45bf648cadcaf49b6e07a9bf89 /indra/llrender/llglslshader.cpp | |
parent | 430d384a93284c87b4e8af5d3bfacbf7e22094bf (diff) | |
parent | b44eb2e7a910e65373dfed54b86aff87ddda918d (diff) |
merge
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
-rw-r--r-- | indra/llrender/llglslshader.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 4b7e639aed..149e8cc548 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,11 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1); } + if (varying_count > 0 && varyings) + { + glTransformFeedbackVaryings(mProgramObject, varying_count, varyings, GL_INTERLEAVED_ATTRIBS); + } + // Map attributes and uniforms if (success) { |