diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-21 16:26:53 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-21 16:26:53 +0000 |
| commit | d47114e5cb39b7e5aa5308b705cd1a77727be7f3 (patch) | |
| tree | 892b2610e95ab23316d086941f9b3113569a5ee8 /indra/newview/lldynamictexture.cpp | |
| parent | 1d25203cbf91bdf390ef9e9ae7c2b5d1b00bb7bb (diff) | |
| parent | d12305496f73e0b55e8e1ec327a2567ca713da22 (diff) | |
Merged in euclid-mDebugGPU (pull request #348)
Remove obsolete mDebugGPU variable and dependent code
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
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; } |