diff --git a/libraries/gl/src/gl/Config.cpp b/libraries/gl/src/gl/Config.cpp index 94bb91a3e9..759cbb98a8 100644 --- a/libraries/gl/src/gl/Config.cpp +++ b/libraries/gl/src/gl/Config.cpp @@ -74,6 +74,10 @@ static void* getGlProcessAddress(const char *namez) { #else + +typedef Bool ( *PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC) (int attribute, unsigned int *value); +PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC QueryCurrentRendererIntegerMESA; + static void* getGlProcessAddress(const char *namez) { return (void*)glXGetProcAddressARB((const GLubyte*)namez); } @@ -92,6 +96,10 @@ void gl::initModuleGl() { wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)getGlProcessAddress("wglCreateContextAttribsARB"); #endif +#if defined(Q_OS_LINUX) + QueryCurrentRendererIntegerMESA = (PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC)getGlProcessAddress("glXQueryCurrentRendererIntegerMESA"); +#endif + #if defined(USE_GLES) gladLoadGLES2Loader(getGlProcessAddress); #else @@ -124,3 +132,14 @@ void gl::setSwapInterval(int interval) { Q_UNUSED(interval); #endif } + +bool gl::queryCurrentRendererIntegerMESA(int attr, unsigned int *value) { + #if defined(Q_OS_LINUX) + if (QueryCurrentRendererIntegerMESA) { + return QueryCurrentRendererIntegerMESA(attr, value); + } + #endif + + *value = 0; + return false; +} diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h index aad000a242..8defbc5bca 100644 --- a/libraries/gl/src/gl/Config.h +++ b/libraries/gl/src/gl/Config.h @@ -52,6 +52,7 @@ namespace gl { void initModuleGl(); int getSwapInterval(); void setSwapInterval(int swapInterval); + bool queryCurrentRendererIntegerMESA(int attr, unsigned int *value); } #endif // hifi_gpu_GPUConfig_h diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp index 3e5043003b..2d0f31cd93 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp @@ -10,11 +10,13 @@ // #include "GLBackend.h" + #include #include #include #include #include +#include "gl/Config.h" #if defined(NSIGHT_FOUND) #include "nvToolsExt.h" @@ -105,13 +107,27 @@ GLBackend::CommandCall GLBackend::_commandCalls[Batch::NUM_COMMANDS] = }; #define GL_GET_INTEGER(NAME) glGetIntegerv(GL_##NAME, &const_cast(NAME)); - + +#define BYTES_PER_KIB 1024L +#define BYTES_PER_MIB (1024L * BYTES_PER_KIB) + GLint GLBackend::MAX_TEXTURE_IMAGE_UNITS{ 0 }; GLint GLBackend::MAX_UNIFORM_BUFFER_BINDINGS{ 0 }; GLint GLBackend::MAX_COMBINED_UNIFORM_BLOCKS{ 0 }; GLint GLBackend::MAX_COMBINED_TEXTURE_IMAGE_UNITS{ 0 }; GLint GLBackend::MAX_UNIFORM_BLOCK_SIZE{ 0 }; GLint GLBackend::UNIFORM_BUFFER_OFFSET_ALIGNMENT{ 1 }; +GLint GLBackend::GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX{ 0 }; +GLint GLBackend::GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX{ 0 }; +GLint GLBackend::GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX{ 0 }; +GLint GLBackend::TEXTURE_FREE_MEMORY_ATI{ 0 }; + +size_t GLBackend::_total_memory{ 0 }; +size_t GLBackend::_dedicated_memory{ 0 }; +GLBackend::VideoCardType GLBackend::_video_card{ GLBackend::Unknown }; + + +#define GLX_RENDERER_VIDEO_MEMORY_MESA 0x8187 void GLBackend::init() { static std::once_flag once; @@ -132,13 +148,54 @@ void GLBackend::init() { GL_GET_INTEGER(MAX_UNIFORM_BLOCK_SIZE); GL_GET_INTEGER(UNIFORM_BUFFER_OFFSET_ALIGNMENT); + if ( vendor.contains("NVIDIA") ) { + qCDebug(gpugllogging) << "NVIDIA card detected"; + GL_GET_INTEGER(GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX); + GL_GET_INTEGER(GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX); + GL_GET_INTEGER(GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX); + + qCDebug(gpugllogging) << "GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX: " << GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX; + qCDebug(gpugllogging) << "GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX: " << GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX; + qCDebug(gpugllogging) << "GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX: " << GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX; + qCDebug(gpugllogging) << "sz: " << sizeof(_total_memory); + + _total_memory = GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX * BYTES_PER_KIB; + _dedicated_memory = GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX * BYTES_PER_KIB; + _video_card = NVIDIA; + + + } else if ( vendor.contains("ATI")) { + qCDebug(gpugllogging) << "ATI card detected"; + GL_GET_INTEGER(TEXTURE_FREE_MEMORY_ATI); + + _total_memory = TEXTURE_FREE_MEMORY_ATI * BYTES_PER_KIB; + _dedicated_memory = _total_memory; + _video_card = ATI; + } else if ( vendor.contains("Intel")) { + unsigned int mem; + + if ( ::gl::queryCurrentRendererIntegerMESA(GLX_RENDERER_VIDEO_MEMORY_MESA, &mem) ) { + _total_memory = mem * BYTES_PER_MIB; + _dedicated_memory = _total_memory; + } + } else { + qCCritical(gpugllogging) << "Don't know how to get memory for OpenGL vendor " << vendor; + _video_card = Unknown; + _dedicated_memory = 0; + _total_memory = 0; + } + + qCDebug(gpugllogging) << "dedicated: " << _dedicated_memory; + qCDebug(gpugllogging) << "total: " << _total_memory; + + LOG_GL_CONTEXT_INFO(gpugllogging, contextInfo); - GPUIdent* gpu = GPUIdent::getInstance(vendor, renderer); + // From here on, GPUIdent::getInstance()->getMumble() should efficiently give the same answers. qCDebug(gpugllogging) << "GPU:"; - qCDebug(gpugllogging) << "\tcard:" << gpu->getName(); - qCDebug(gpugllogging) << "\tdriver:" << gpu->getDriver(); - qCDebug(gpugllogging) << "\tdedicated memory:" << gpu->getMemory() << "MB"; + qCDebug(gpugllogging) << "\ttotal memory:" << (_total_memory / BYTES_PER_KIB) << "KB"; + qCDebug(gpugllogging) << "\tdedicated memory:" << (_dedicated_memory / BYTES_PER_KIB) << "KB"; + qCDebug(gpugllogging) << "\tavailable memory:" << (getAvailableMemory() / BYTES_PER_KIB) << "KB"; qCDebug(gpugllogging) << "Limits:"; qCDebug(gpugllogging) << "\tmax textures:" << MAX_TEXTURE_IMAGE_UNITS; qCDebug(gpugllogging) << "\tmax texture binding:" << MAX_COMBINED_TEXTURE_IMAGE_UNITS; @@ -152,6 +209,24 @@ void GLBackend::init() { }); } +size_t GLBackend::getAvailableMemory() { + GLint mem; + + switch( _video_card ) { + case NVIDIA: + glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &mem); + return mem * BYTES_PER_KIB; + case ATI: + glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &mem); + return mem * BYTES_PER_KIB; + case Unknown: + break; + } + + return 0; + +} + GLBackend::GLBackend(bool syncCache) { _pipeline._cameraCorrectionBuffer._buffer->flush(); initShaderBinaryCache(); diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h index a13718f5a2..1c8230c972 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h +++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h @@ -67,6 +67,12 @@ protected: GLBackend(); public: + enum VideoCardType { + ATI, + NVIDIA, + Unknown + }; + #if defined(USE_GLES) // https://www.khronos.org/registry/OpenGL-Refpages/es3/html/glGet.xhtml static const GLint MIN_REQUIRED_TEXTURE_IMAGE_UNITS = 16; @@ -89,6 +95,24 @@ public: static GLint MAX_COMBINED_TEXTURE_IMAGE_UNITS; static GLint MAX_UNIFORM_BLOCK_SIZE; static GLint UNIFORM_BUFFER_OFFSET_ALIGNMENT; + static GLint GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX; + static GLint GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX; + static GLint GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX; + static GLint TEXTURE_FREE_MEMORY_ATI; + + + static size_t _total_memory; + static size_t _dedicated_memory; + static VideoCardType _video_card; + + + static size_t getTotalMemory() { return _total_memory; } + static size_t getDedicatedMemory() { return _dedicated_memory; } + + static size_t getAvailableMemory(); + + + virtual ~GLBackend(); diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLTextureTransfer.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLTextureTransfer.cpp index c9a5856a8d..98c8244c91 100644 --- a/libraries/gpu-gl-common/src/gpu/gl/GLTextureTransfer.cpp +++ b/libraries/gpu-gl-common/src/gpu/gl/GLTextureTransfer.cpp @@ -185,7 +185,11 @@ void GLTextureTransferEngineDefault::updateMemoryPressure() { size_t allowedMemoryAllocation = gpu::Texture::getAllowedGPUMemoryUsage(); if (0 == allowedMemoryAllocation) { - allowedMemoryAllocation = DEFAULT_ALLOWED_TEXTURE_MEMORY; + allowedMemoryAllocation = GLBackend::getTotalMemory(); + if ( 0 == allowedMemoryAllocation ) { + // Last resort, if we failed to detect + allowedMemoryAllocation = DEFAULT_ALLOWED_TEXTURE_MEMORY; + } } // Clear any defunct textures (weak pointers that no longer have a valid texture)