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

Fixed Image:setMipmapFilter keeping bad state around if it errors.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-12-05 12:19:50 -04:00
parent 5fac441a51
commit c4a1457603
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Image.cpp
+12
View File
@@ -256,6 +256,7 @@ void Image::checkMipmapsCreated()
void Image::setFilter(const Texture::Filter &f) void Image::setFilter(const Texture::Filter &f)
{ {
const Filter oldfilter = filter;
filter = f; filter = f;
// We don't want filtering or (attempted) mipmaps on the default texture. // We don't want filtering or (attempted) mipmaps on the default texture.
@@ -267,8 +268,19 @@ void Image::setFilter(const Texture::Filter &f)
bind(); bind();
gl.setTextureFilter(filter); gl.setTextureFilter(filter);
try
{
checkMipmapsCreated(); checkMipmapsCreated();
} }
catch (love::Exception &)
{
// Don't keep the new mipmap filter if we can't create mipmaps.
filter = oldfilter;
gl.setTextureFilter(filter);
throw;
}
}
void Image::setWrap(const Texture::Wrap &w) void Image::setWrap(const Texture::Wrap &w)
{ {