Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 7 years ago
commit 09dd0e57c5

@ -1195,11 +1195,11 @@ sint CDriverGL::getTotalVideoMemory() const
if (_Extensions.ATIMeminfo) if (_Extensions.ATIMeminfo)
{ {
GLint memoryInKiB = 0; GLint params[4];
glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, &memoryInKiB); glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, params);
nlinfo("3D: GL_TEXTURE_FREE_MEMORY_ATI returned %d KiB", memoryInKiB); nlinfo("3D: GL_TEXTURE_FREE_MEMORY_ATI returned %d KiB", params[0]);
return memoryInKiB; return params[0];
} }
#if defined(NL_OS_WINDOWS) #if defined(NL_OS_WINDOWS)

Loading…
Cancel
Save