LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 16:20:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up texture VRAM usage tracking.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-05-06 23:56:10 -03:00
parent b590edf27d
commit b019a4a64c
13 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+16 -21
View File
@@ -158,7 +158,6 @@ Canvas::Canvas(const Settings &settings)
, texture(0)
, renderbuffer(0)
, actualSamples(0)
, textureMemory(0)
{
format = getSizedFormat(format);
@@ -245,6 +244,13 @@ bool Canvas::loadVolatile()
renderbuffer = 0;
status = GL_FRAMEBUFFER_COMPLETE;
// getMaxRenderbufferSamples will be 0 on systems that don't support
// multisampled renderbuffers / don't export FBO multisample extensions.
actualSamples = getRequestedMSAA();
actualSamples = std::min(actualSamples, gl.getMaxRenderbufferSamples());
actualSamples = std::max(actualSamples, 0);
actualSamples = actualSamples == 1 ? 0 : actualSamples;
if (isReadable())
{
glGenTextures(1, &texture);
@@ -292,29 +298,19 @@ bool Canvas::loadVolatile()
}
}
// getMaxRenderbufferSamples will be 0 on systems that don't support
// multisampled renderbuffers / don't export FBO multisample extensions.
actualSamples = getRequestedMSAA();
actualSamples = std::min(actualSamples, gl.getMaxRenderbufferSamples());
actualSamples = std::max(actualSamples, 0);
actualSamples = actualSamples == 1 ? 0 : actualSamples;
if (!isReadable() || actualSamples > 0)
createRenderbuffer(pixelWidth, pixelHeight, actualSamples, format, renderbuffer);
size_t prevmemsize = textureMemory;
textureMemory = getPixelFormatSize(format) * pixelWidth * pixelHeight;
if (actualSamples > 0 && isReadable())
textureMemory += (textureMemory * actualSamples);
else if (actualSamples > 0)
textureMemory *= actualSamples;
int64 memsize = getPixelFormatSize(format) * pixelWidth * pixelHeight;
if (getMipmapCount() > 1)
textureMemory *= 1.33334;
memsize *= 1.33334;
gl.updateTextureMemorySize(prevmemsize, textureMemory);
if (actualSamples > 1 && isReadable())
memsize += getPixelFormatSize(format) * pixelWidth * pixelHeight * actualSamples;
else if (actualSamples > 1)
memsize *= actualSamples;
setGraphicsMemorySize(memsize);
return true;
}
@@ -334,8 +330,7 @@ void Canvas::unloadVolatile()
renderbuffer = 0;
texture = 0;
gl.updateTextureMemorySize(textureMemory, 0);
textureMemory = 0;
setGraphicsMemorySize(0);
}
void Canvas::setFilter(const Texture::Filter &f)