Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change conditionals according to review

Browse source
This commit is contained in:
Julian Groß 2020-12-15 04:15:44 +01:00
parent 5e17639bed
commit 0cebb700fb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ void GLBackend::init() {
if (vendor.contains("NVIDIA") ) { if (vendor.contains("NVIDIA") ) {
qCDebug(gpugllogging) << "NVIDIA card detected"; qCDebug(gpugllogging) << "NVIDIA card detected";
#if !defined(Q_OS_ANDROID) == !defined(USE_GLES) #if !defined(Q_OS_ANDROID) && !defined(USE_GLES)
GL_GET_INTEGER(GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX); 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_TOTAL_AVAILABLE_MEMORY_NVX);
GL_GET_INTEGER(GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX); GL_GET_INTEGER(GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX);
@ -170,7 +170,7 @@ void GLBackend::init() {
} else if (vendor.contains("ATI")) { } else if (vendor.contains("ATI")) {
qCDebug(gpugllogging) << "ATI card detected"; qCDebug(gpugllogging) << "ATI card detected";
#if !defined(Q_OS_ANDROID) == !defined(USE_GLES) #if !defined(Q_OS_ANDROID) && !defined(USE_GLES)
GL_GET_INTEGER(TEXTURE_FREE_MEMORY_ATI); GL_GET_INTEGER(TEXTURE_FREE_MEMORY_ATI);
#endif #endif
@ -225,12 +225,12 @@ size_t GLBackend::getAvailableMemory() {
switch( _videoCard ) { switch( _videoCard ) {
case NVIDIA: case NVIDIA:
#if !defined(Q_OS_ANDROID) == !defined(USE_GLES) #if !defined(Q_OS_ANDROID) && !defined(USE_GLES)
glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &mem[0]); glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &mem[0]);
#endif #endif
return mem[0] * BYTES_PER_KIB; return mem[0] * BYTES_PER_KIB;
case ATI: case ATI:
#if !defined(Q_OS_ANDROID) == !defined(USE_GLES) #if !defined(Q_OS_ANDROID) && !defined(USE_GLES)
glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &mem[0]); glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &mem[0]);
#endif #endif
return mem[0] * BYTES_PER_KIB; return mem[0] * BYTES_PER_KIB;