diff options
Diffstat (limited to 'indra/llappearance/lltexlayerparams.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayerparams.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp index ec02d0d7fc..604e0124cb 100644 --- a/indra/llappearance/lltexlayerparams.cpp +++ b/indra/llappearance/lltexlayerparams.cpp @@ -149,7 +149,7 @@ LLTexLayerParamAlpha::LLTexLayerParamAlpha(const LLTexLayerParamAlpha& pOther) mCachedProcessedTexture(pOther.mCachedProcessedTexture), mStaticImageTGA(pOther.mStaticImageTGA), mStaticImageRaw(pOther.mStaticImageRaw), - mNeedsCreateTexture(pOther.mNeedsCreateTexture), + mNeedsCreateTexture(pOther.mNeedsCreateTexture.load()), mStaticImageInvalid(pOther.mStaticImageInvalid), mAvgDistortionVec(pOther.mAvgDistortionVec), mCachedEffectiveWeight(pOther.mCachedEffectiveWeight) @@ -321,11 +321,7 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height) // We now have something in one of our caches LLTexLayerSet::sHasCaches |= mCachedProcessedTexture ? TRUE : FALSE; -#if GL_VERSION_1_1 mCachedProcessedTexture->setExplicitFormat(GL_ALPHA8, GL_ALPHA); -#else - mCachedProcessedTexture->setExplicitFormat(GL_ALPHA8_EXT, GL_ALPHA); -#endif } // Applies domain and effective weight to data as it is decoded. Also resizes the raw image if needed. @@ -348,9 +344,6 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height) mCachedProcessedTexture->setAddressMode(LLTexUnit::TAM_CLAMP); } -#if GL_VERSION_1_1 - LLGLSNoAlphaTest gls_no_alpha_test; -#endif gGL.getTexUnit(0)->bind(mCachedProcessedTexture); gl_rect_2d_simple_tex(width, height); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); @@ -367,9 +360,6 @@ BOOL LLTexLayerParamAlpha::render(S32 x, S32 y, S32 width, S32 height) } else { -#if GL_VERSION_1_1 - LLGLDisable no_alpha(GL_ALPHA_TEST); -#endif gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); gGL.color4f(0.f, 0.f, 0.f, effective_weight); gl_rect_2d_simple(width, height); |