diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-08-17 20:54:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-08-17 20:54:04 +0800 |
| commit | f8eca3e75a9325a16c0900eadfc893d049819eab (patch) | |
| tree | 98c32af6a6674934c2956a13b2264364aee3241e | |
| parent | 2fc9c69bd7975c6439272e8be14eb9c9284b938c (diff) | |
Re-enable x11_detect_VRAM_kb use
It's an error according to GCC when defined but not used.
It could, and probably should, still be used anyway, just not the SDL
version.
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 7c8c3ab17a..7e2af357eb 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -625,7 +625,6 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B bmpsurface = NULL; } - /* // Detect video memory size. # if LL_X11 gGLManager.mVRAM = x11_detect_VRAM_kb() / 1024; @@ -635,6 +634,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B } else # endif // LL_X11 { + /* // fallback to letting SDL detect VRAM. // note: I've not seen SDL's detection ever actually find // VRAM != 0, but if SDL *does* detect it then that's a bonus. @@ -643,8 +643,8 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B { LL_INFOS() << "SDL detected " << gGLManager.mVRAM << "MB VRAM." << LL_ENDL; } + */ } - */ // If VRAM is not detected, that is handled later // *TODO: Now would be an appropriate time to check for some |