diff options
| -rw-r--r-- | indra/llrender/llgl.cpp | 13 | ||||
| -rw-r--r-- | indra/llrender/llgl.h | 3 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 7 |
4 files changed, 2 insertions, 26 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index ada5371c1a..36177e00e8 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -471,8 +471,6 @@ LLGLManager::LLGLManager() : mHasSeparateSpecularColor(FALSE), - mDebugGPU(FALSE), - mDriverVersionMajor(1), mDriverVersionMinor(0), mDriverVersionRelease(0), @@ -865,16 +863,7 @@ bool LLGLManager::initGL() return true; } -void LLGLManager::setToDebugGPU() -{ - //"MOBILE INTEL(R) 965 EXPRESS CHIP", - if (mGLRenderer.find("INTEL") != std::string::npos && mGLRenderer.find("965") != std::string::npos) - { - mDebugGPU = TRUE ; - } - - return ; -} +//void LLGLManager::setToDebugGPU() void LLGLManager::getGLInfo(LLSD& info) { diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 91ef4e9102..95cc1899ee 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -142,9 +142,6 @@ public: // Misc extensions BOOL mHasSeparateSpecularColor; - //whether this GPU is in the debug list. - BOOL mDebugGPU; - S32 mDriverVersionMajor; S32 mDriverVersionMinor; S32 mDriverVersionRelease; diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2feba40d23..9452028174 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1291,10 +1291,7 @@ void LLAppViewer::checkMemory() //const static F32 MAX_QUIT_WAIT_TIME = 30.0f ; //seconds //static F32 force_quit_timer = MAX_QUIT_WAIT_TIME + MEMORY_CHECK_INTERVAL ; - if(!gGLManager.mDebugGPU) - { - return ; - } + return ; if(MEMORY_CHECK_INTERVAL > mMemCheckTimer.getElapsedTimeF32()) { diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 89c20904c1..1edf8fd47c 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 ); |