diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-07-03 10:04:05 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-07-03 10:04:05 -0700 |
| commit | 48f169423ba0c1da8ffe13fc8bc4cec76336d8fc (patch) | |
| tree | b98913a1c97fa68a5e7d892839c01b1db34c4e15 /indra/llappearance | |
| parent | 7e5000bb64ca8eea3fe188ebb7bccff3bdfa82e7 (diff) | |
SL-11545, SL-11543, SL-10625
Fix emissives without normal maps clobbering the alpha output in materialF.
Modify glow size calc to get close to pre-EEP sun glow behavior (may require sky vert settings >= mid).
Make bake ignore alpha readback for Intel until we can determine why their drivers now go boom.
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 22b3364559..645274a990 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1065,7 +1065,7 @@ LLTexLayer::~LLTexLayer() iter != mAlphaCache.end(); iter++ ) { U8* alpha_data = iter->second; - delete [] alpha_data; + ll_aligned_free_32(alpha_data); } } @@ -1572,7 +1572,7 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC { alpha_cache_t::iterator iter2 = mAlphaCache.begin(); // arbitrarily grab the first entry alpha_data = iter2->second; - delete [] alpha_data; + ll_aligned_free_32(alpha_data); mAlphaCache.erase(iter2); } @@ -1588,7 +1588,9 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC mAlphaCache[cache_index] = alpha_data; bool skip_readback = LLRender::sNsightDebugSupport; // nSight doesn't support use of glReadPixels - // || gGLManager.mIsIntel; SL-10625? + + // SL-10625 and neither does Intel in many cases + skip_readback = skip_readback || gGLManager.mIsIntel; if (!skip_readback) { |