diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-22 18:33:19 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-22 18:33:19 +0200 |
| commit | df497ee700eab8b93c2b94bc1abfcabedf424900 (patch) | |
| tree | 3897e1b134b4c62d6f398e2c8c74d55f6862b06f | |
| parent | 7d745679cef8fd91394ca97f0d9f1cf252d57782 (diff) | |
| parent | 59d57c438e9a3d5f65f705b976a9207881ee7f80 (diff) | |
Merged in lindenlab/viewer-lynx
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index db3adcec2b..2c16c3c942 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -111,9 +111,9 @@ const F32 desired_discard_bias_max = (F32)MAX_DISCARD_LEVEL; // max number of le const F64 log_2 = log(2.0); #if ADDRESS_SIZE == 32 -const U32 DESIRED_NORMAL_FETCHED_TEXTURE_SIZE = (U32)LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT / 2; +const U32 DESIRED_NORMAL_TEXTURE_SIZE = (U32)LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT / 2; #else -const U32 DESIRED_NORMAL_FETCHED_TEXTURE_SIZE = (U32)LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT; +const U32 DESIRED_NORMAL_TEXTURE_SIZE = (U32)LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT; #endif //---------------------------------------------------------------------------------------------- @@ -1601,10 +1601,6 @@ void LLViewerFetchedTexture::processTextureStats() else { U32 desired_size = MAX_IMAGE_SIZE_DEFAULT; // MAX_IMAGE_SIZE_DEFAULT = 1024 and max size ever is 2048 - if (mBoostLevel <= LLGLTexture::BOOST_SCULPTED) - { - desired_size = DESIRED_NORMAL_FETCHED_TEXTURE_SIZE; - } if(!mKnownDrawWidth || !mKnownDrawHeight || mFullWidth <= mKnownDrawWidth || mFullHeight <= mKnownDrawHeight) { if (mFullWidth > desired_size || mFullHeight > desired_size) @@ -3227,7 +3223,7 @@ void LLViewerLODTexture::processTextureStats() U32 desired_size = MAX_IMAGE_SIZE_DEFAULT; // MAX_IMAGE_SIZE_DEFAULT = 1024 and max size ever is 2048 if (mBoostLevel <= LLGLTexture::BOOST_SCULPTED) { - desired_size = DESIRED_NORMAL_FETCHED_TEXTURE_SIZE; + desired_size = DESIRED_NORMAL_TEXTURE_SIZE; } if (mFullWidth > desired_size || mFullHeight > desired_size) min_discard = 1.f; |