Re-enable threaded texture transfer

This commit is contained in:
Brad Davis 2016-09-15 15:45:47 -07:00
parent 50233f6ffb
commit 74481b3c1f
2 changed files with 10 additions and 8 deletions

View file

@ -108,13 +108,15 @@ float GLTexture::getMemoryPressure() {
} else {
// Check the global free GPU memory
auto freeGpuMemory = getFreeDedicatedMemory();
static gpu::Size lastFreeGpuMemory = 0;
auto freePercentage = (float)freeGpuMemory / (float)totalGpuMemory;
if (freeGpuMemory != lastFreeGpuMemory) {
lastFreeGpuMemory = freeGpuMemory;
if (freePercentage < MIN_FREE_GPU_MEMORY_PERCENTAGE) {
qDebug() << "Exceeded max GPU memory";
return 2.0;
if (freeGpuMemory) {
static gpu::Size lastFreeGpuMemory = 0;
auto freePercentage = (float)freeGpuMemory / (float)totalGpuMemory;
if (freeGpuMemory != lastFreeGpuMemory) {
lastFreeGpuMemory = freeGpuMemory;
if (freePercentage < MIN_FREE_GPU_MEMORY_PERCENTAGE) {
qDebug() << "Exceeded max GPU memory";
return 2.0;
}
}
}
}

View file

@ -18,7 +18,7 @@
#include "GLShared.h"
#ifdef Q_OS_WIN
//#define THREADED_TEXTURE_TRANSFER
#define THREADED_TEXTURE_TRANSFER
#endif
namespace gpu { namespace gl {