diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-09-09 10:28:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 10:28:57 -0700 |
| commit | 33116ea35ec9a925c1601c8f1833e4d1e9f8390b (patch) | |
| tree | ba3b492b8cdaa69a8de8707265ddda6ca0f085c6 /indra/llwindow/llwindowwin32.cpp | |
| parent | f3f3f99fcf28dde7bb0e9dc7459be12beb1dfe16 (diff) | |
| parent | 1f754e50908ba325c132b8d83383f7f0dbbdf793 (diff) | |
Merge pull request #2530 from secondlife/release/2024.08-DeltaFPS
Release/2024.08 delta fps
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -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 25ef1336c8..0b6ee541c0 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4642,6 +4642,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); @@ -4738,7 +4744,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) |