diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
|---|---|---|
| committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
| commit | 0ea94d2948ba8237fd39fa0df219e07ee44c9ff1 (patch) | |
| tree | 71b56d5d6937a66166ca17eb0413a4a88c363113 /indra/newview/lldynamictexture.cpp | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merged master into DRTVWR-539
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 89c20904c1..8b8273d183 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -56,13 +56,6 @@ LLViewerDynamicTexture::LLViewerDynamicTexture(S32 width, S32 height, S32 compon { llassert((1 <= components) && (components <= 4)); - if(gGLManager.mDebugGPU) - { - if(components == 3) - { - mComponents = 4 ; //convert to 32bits. - } - } generateGLTexture(); llassert( 0 <= order && order < ORDER_COUNT ); @@ -211,7 +204,7 @@ void LLViewerDynamicTexture::postRender(BOOL success) BOOL LLViewerDynamicTexture::updateAllInstances() { sNumRenders = 0; - if (gGLManager.mIsDisabled || LLPipeline::sMemAllocationThrottled) + if (gGLManager.mIsDisabled) { return TRUE; } |