diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-11 15:19:27 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-11 15:19:27 -0600 |
| commit | 9aefe34998bcd2320b09924d9a78e518627ddd79 (patch) | |
| tree | e2f2d79c995f3b687dd565f52f9f154bcf2666be /indra/llrender/llrender.cpp | |
| parent | dcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (diff) | |
EXT-6276 Put in some gl flush calls to register combiner functions (why these are being used for UI now is beyond me)
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 656f690db5..0ce6bdf398 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -150,6 +150,7 @@ void LLTexUnit::activate(void) if ((S32)gGL.mCurrTextureUnitIndex != mIndex || gGL.mDirty) { + gGL.flush(); glActiveTextureARB(GL_TEXTURE0_ARB + mIndex); gGL.mCurrTextureUnitIndex = mIndex; } @@ -567,6 +568,7 @@ void LLTexUnit::setTextureCombiner(eTextureBlendOp op, eTextureBlendSrc src1, eT if (mCurrBlendType != TB_COMBINE || gGL.mDirty) { mCurrBlendType = TB_COMBINE; + gGL.flush(); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB); } @@ -577,6 +579,8 @@ void LLTexUnit::setTextureCombiner(eTextureBlendOp op, eTextureBlendSrc src1, eT return; } + gGL.flush(); + // Get the gl source enums according to the eTextureBlendSrc sources passed in GLint source1 = getTextureSource(src1); GLint source2 = getTextureSource(src2); |