Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try the MESA pathway always if not ATI or NVIDIA

Browse source 
This will work fine on non-Linux systems, because the query should
simply fail on systems that don't support it.

This should improve functionality on nouveau
This commit is contained in:
Dale Glass 2020-08-09 01:25:39 +02:00
parent 991cfdae69
commit 482211d6eb
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
View file

@ -149,6 +149,7 @@ void GLBackend::init() {
GL_GET_INTEGER(UNIFORM_BUFFER_OFFSET_ALIGNMENT);
GPUIdent* gpu = GPUIdent::getInstance(vendor, renderer);
unsigned int mem;
if (vendor.contains("NVIDIA") ) {
qCDebug(gpugllogging) << "NVIDIA card detected";
@ -173,21 +174,15 @@ void GLBackend::init() {
_totalMemory = TEXTURE_FREE_MEMORY_ATI * BYTES_PER_KIB;
_dedicatedMemory = _totalMemory;
_videoCard = ATI;
} else if (vendor.contains("Intel")) {
unsigned int mem;
if ( ::gl::queryCurrentRendererIntegerMESA(GLX_RENDERER_VIDEO_MEMORY_MESA, &mem) ) {
} else if ( ::gl::queryCurrentRendererIntegerMESA(GLX_RENDERER_VIDEO_MEMORY_MESA, &mem) ) {
// This works only on Linux. queryCurrentRendererIntegerMESA will return false if the
// function is not supported because we're not on Linux, or for any other reason.
qCDebug(gpugllogging) << "MESA card detected";
_totalMemory = mem * BYTES_PER_MIB;
_dedicatedMemory = _totalMemory;
_videoCard = Intel;
} else {
qCWarning(gpugllogging) << "Intel card on non-Linux system, trying GPUIdent fallback";
_videoCard = Unknown;
_dedicatedMemory = gpu->getMemory();
_totalMemory = _dedicatedMemory;
}
_videoCard = MESA;
} else {
qCCritical(gpugllogging) << "Don't know how to get memory for OpenGL vendor " << vendor;
qCCritical(gpugllogging) << "Don't know how to get memory for OpenGL vendor " << vendor << "; renderer " << renderer << ", trying fallback";
_videoCard = Unknown;
_dedicatedMemory = gpu->getMemory();
_totalMemory = _dedicatedMemory;
@ -230,7 +225,7 @@ size_t GLBackend::getAvailableMemory() {
case ATI:
glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &mem);
return mem * BYTES_PER_KIB;
case Intel:
case MESA:
return 0; // Don't know the current value
case Unknown:
break;
@ -244,7 +239,7 @@ bool GLBackend::availableMemoryKnown() {
switch( _videoCard ) {
case NVIDIA: return true;
case ATI: return true;
case Intel: return false;
case MESA: return false;
case Unknown: return false;
}

2
libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
View file

@ -70,7 +70,7 @@ public:
enum VideoCardType {
ATI,
NVIDIA,
Intel,
MESA,
Unknown
};