diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-07 17:46:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-07 17:46:04 +0800 |
| commit | a742349cabd97b42e61e1b445f79840407cb3479 (patch) | |
| tree | 6d6f043f53cd3d7b9bf004e543932a86cb89ad7c /indra/llwindow | |
| parent | 895e2decd591ce8ab3cfcdce93c8b10447eedbee (diff) | |
| parent | 1f754e50908ba325c132b8d83383f7f0dbbdf793 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 7f0e890957..9dc2644650 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4627,6 +4627,12 @@ void LLWindowWin32::LLWindowWin32Thread::checkDXMem() { if (!mGLReady || mGotGLBuffer) { return; } + if ((gGLManager.mHasAMDAssociations || gGLManager.mHasNVXGpuMemoryInfo) && gGLManager.mVRAM != 0) + { // OpenGL already told us the memory budget, don't ask DX + mGotGLBuffer = true; + return; + } + IDXGIFactory4* p_factory = nullptr; HRESULT res = CreateDXGIFactory1(__uuidof(IDXGIFactory4), (void**)&p_factory); @@ -4723,7 +4729,7 @@ void LLWindowWin32::LLWindowWin32Thread::run() { LL_PROFILE_ZONE_SCOPED_CATEGORY_WIN32; - // Check memory budget using DirectX + // Check memory budget using DirectX if OpenGL doesn't have the means to tell us checkDXMem(); if (mWindowHandleThrd != 0) |