diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-01-06 17:30:19 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-04 15:42:06 +0800 |
| commit | a39a56e2665156bf3948c421f0afe74fe14f4b2b (patch) | |
| tree | 6bf710de40b5666a9ddee8aeb54d84936a50d312 /indra/llrender | |
| parent | 1bdd63125cd9d4bfb6a922bb619b547789942359 (diff) | |
VRAM detection implementation using GLX Mesa
Plus make FreeBSD gets what Linux gets in the llgl.cpp file.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 273871678c..a07ab2dbfc 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -56,6 +56,9 @@ #if LL_WINDOWS #include "lldxhardware.h" +#elif LL_LINUX || __FreeBSD__ +#define GLX_GLXEXT_PROTOTYPES 1 +#include <GL/glx.h> #endif #ifdef _DEBUG @@ -1151,7 +1154,7 @@ bool LLGLManager::initGL() // from being recognized as ATI. // NOTE: AMD has been pretty good about not breaking this check, do not rename without good reason if (mGLVendor.substr(0,4) == "ATI " -#if LL_LINUX +#if LL_LINUX || __FreeBSD__ || mGLVendor.find("AMD") != std::string::npos #endif //LL_LINUX ) @@ -1222,7 +1225,7 @@ bool LLGLManager::initGL() } } else #endif -#if LL_WINDOWS || LL_LINUX +#if LL_WINDOWS || LL_LINUX || __FreeBSD__ if (mHasNVXGpuMemoryInfo) { GLint mem_kb = 0; @@ -1235,6 +1238,13 @@ bool LLGLManager::initGL() } } #endif +#if LL_LINUX || __FreeBSD__ + if (!mVRAM) + { + auto queryInteger = (PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC)glXGetProcAddressARB((const GLubyte *)"glXQueryCurrentRendererIntegerMESA"); + queryInteger(GLX_RENDERER_VIDEO_MEMORY_MESA, &mVRAM); + } +#endif // LL_LINUX || __FreeBSD__ #if LL_WINDOWS if (mVRAM < 256) @@ -1417,7 +1427,7 @@ void LLGLManager::shutdownGL() void LLGLManager::initExtensions() { -#if LL_LINUX +#if LL_LINUX || __FreeBSD__ glh_init_extensions(""); #endif #if LL_DARWIN @@ -1443,7 +1453,7 @@ void LLGLManager::initExtensions() mHasTransformFeedback = mGLVersion >= 3.99f; mHasDebugOutput = mGLVersion >= 4.29f; -#if LL_WINDOWS || LL_LINUX +#if LL_WINDOWS || LL_LINUX || __FreeBSD__ if( gGLHExts.mSysExts ) mHasNVXGpuMemoryInfo = ExtensionExists("GL_NVX_gpu_memory_info", gGLHExts.mSysExts); else |