imported changes from love-0.9.2

This commit is contained in:
fysx
2015-02-16 00:37:14 +01:00
parent 3cfecd46d9
commit d6f1d8bd70
65 changed files with 7033 additions and 7858 deletions
@@ -595,7 +595,9 @@ bool Canvas::loadVolatile()
if (glGetError() != GL_NO_ERROR)
{
status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
gl.deleteTexture(texture);
texture = 0;
status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
return false;
}
@@ -619,7 +621,14 @@ bool Canvas::loadVolatile()
status = strategy->createFBO(fbo, texture);
if (status != GL_FRAMEBUFFER_COMPLETE)
{
if (fbo != 0)
{
strategy->deleteFBO(fbo, 0, 0);
fbo = 0;
}
return false;
}
clear(Color(0, 0, 0, 0));