diff options
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 23 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
3 files changed, 2 insertions, 41 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 9e2e07102e..201330137f 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -48,8 +48,6 @@ #include "llthreadsafequeue.h" #include "stringize.h" #include "llframetimer.h" -#include "commoncontrol.h" // TODO: Remove after testing -#include "llsd.h" // TODO: Remove after testing // System includes #include <commdlg.h> @@ -418,9 +416,7 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool std::atomic<U32> mAvailableVRAM; - bool mTryUseDXGIAdapter; // TODO: Remove after testing IDXGIAdapter3* mDXGIAdapter = nullptr; - bool mTryUseD3DDevice; // TODO: Remove after testing LPDIRECT3D9 mD3D = nullptr; LPDIRECT3DDEVICE9 mD3DDevice = nullptr; }; @@ -4553,14 +4549,6 @@ U32 LLWindowWin32::getAvailableVRAMMegabytes() inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread() : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE) { - const LLSD skipDXGI{ LL::CommonControl::get("Global", "DisablePrimaryGraphicsMemoryAccounting") }; // TODO: Remove after testing - LL_WARNS() << "DisablePrimaryGraphicsMemoryAccounting: " << skipDXGI << ", as boolean: " << skipDXGI.asBoolean() << LL_ENDL; - mTryUseDXGIAdapter = !skipDXGI.asBoolean(); - LL_WARNS() << "mTryUseDXGIAdapter: " << mTryUseDXGIAdapter << LL_ENDL; - const LLSD skipD3D{ LL::CommonControl::get("Global", "DisableSecondaryGraphicsMemoryAccounting") }; // TODO: Remove after testing - LL_WARNS() << "DisableSecondaryGraphicsMemoryAccounting: " << skipD3D << ", as boolean: " << skipD3D.asBoolean() << LL_ENDL; - mTryUseD3DDevice = !skipD3D.asBoolean(); - LL_WARNS() << "mTryUseD3DDevice: " << mTryUseD3DDevice << LL_ENDL; ThreadPool::start(); } @@ -4677,7 +4665,7 @@ void debugEnumerateGraphicsAdapters() void LLWindowWin32::LLWindowWin32Thread::initDX() { - if (mDXGIAdapter == NULL && mTryUseDXGIAdapter) + if (mDXGIAdapter == NULL) { debugEnumerateGraphicsAdapters(); @@ -4711,7 +4699,7 @@ void LLWindowWin32::LLWindowWin32Thread::initDX() void LLWindowWin32::LLWindowWin32Thread::initD3D() { - if (mDXGIAdapter == NULL && mD3DDevice == NULL && mTryUseD3DDevice && mWindowHandle != 0) + if (mDXGIAdapter == NULL && mD3DDevice == NULL && mWindowHandle != 0) { mD3D = Direct3DCreate9(D3D_SDK_VERSION); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index afa8217af2..bc4945eca5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3387,29 +3387,6 @@ <key>Value</key> <integer>0</integer> </map> - <!-- TODO: Remove settings keys DisablePrimaryGraphicsMemoryAccounting and DisableSecondaryGraphicsMemoryAccounting after testing, and code that references them --> - <key>DisablePrimaryGraphicsMemoryAccounting</key> - <map> - <key>Comment</key> - <string>Disable the first method used to detect GPU memory use</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>DisableSecondaryGraphicsMemoryAccounting</key> - <map> - <key>Comment</key> - <string>Disable the second method used to detect GPU memory use, used as a fallback when the first method fails</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>DisableTextHyperlinkActions</key> <map> <key>Comment</key> diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d4e667bcc6..9ec3418132 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -434,7 +434,6 @@ void LLPipeline::connectRefreshCachedSettingsSafe(const std::string name) void LLPipeline::init() { - LL_WARNS() << "Begin pipeline initialization" << LL_ENDL; // TODO: Remove after testing refreshCachedSettings(); gOctreeMaxCapacity = gSavedSettings.getU32("OctreeMaxNodeCapacity"); @@ -451,7 +450,6 @@ void LLPipeline::init() mInitialized = true; stop_glerror(); - LL_WARNS() << "No GL errors yet. Pipeline initialization will continue." << LL_ENDL; // TODO: Remove after testing //create render pass pools getPool(LLDrawPool::POOL_ALPHA); @@ -512,9 +510,7 @@ void LLPipeline::init() // Enable features - LL_WARNS() << "Shader initialization start" << LL_ENDL; // TODO: Remove after testing LLViewerShaderMgr::instance()->setShaders(); - LL_WARNS() << "Shader initialization end" << LL_ENDL; // TODO: Remove after testing stop_glerror(); |