diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-03-14 12:03:34 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-03-14 12:03:34 -0700 |
| commit | 6304186421e5d8203d9892ac0647db05d0de183a (patch) | |
| tree | 384646de1a60f1457ed919b7558865cf1c0bc004 /indra/llrender | |
| parent | 82c8675f12cd25ded91e9c284500a67adbef8362 (diff) | |
| parent | 868cd32e5e229e503f1b5b1d5ec543fd6f76cb7f (diff) | |
Merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 5 | ||||
| -rw-r--r-- | indra/llrender/llglslshader.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 9a4eeb59df..471d73febf 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -401,11 +401,6 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes, // work-around missing mix(vec3,vec3,bvec3) mDefines["OLD_SELECT"] = "1"; #endif - - if (mExtraLinkObject) - { - attachObject(mExtraLinkObject); - } //compile new source vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin(); diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index e5110fe1c4..830bad2aef 100644 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -218,8 +218,6 @@ public: std::vector<U32> mTextureMagFilter; std::vector<U32> mTextureMinFilter; - GLhandleARB mExtraLinkObject = 0; - private: void unloadInternal(); }; |