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

The format of the ImageData returned by Canvas:newImageData now matches the Canvas' format as best as possible.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-05-23 13:21:44 -03:00
parent e4823ccf77
commit 57b70e2a7b
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Canvas.cpp
+31 -6
View File
@@ -605,12 +605,37 @@ love::image::ImageData *Canvas::newImageData(love::image::Image *image, int x, i
if (x < 0 || y < 0 || w <= 0 || h <= 0 || (x + w) > width || (y + h) > height) if (x < 0 || y < 0 || w <= 0 || h <= 0 || (x + w) > width || (y + h) > height)
throw love::Exception("Invalid ImageData rectangle dimensions."); throw love::Exception("Invalid ImageData rectangle dimensions.");
int row = 4 * w; GLenum datatype = GL_UNSIGNED_BYTE;
int size = row * h; image::ImageData::Format imageformat = image::ImageData::FORMAT_RGBA8;
GLubyte *pixels = nullptr;
switch (getSizedFormat(format))
{
case FORMAT_RGB10A2: // FIXME: Conversions aren't supported in GLES
datatype = GL_UNSIGNED_SHORT;
imageformat = image::ImageData::FORMAT_RGBA16;
break;
case FORMAT_R16F:
case FORMAT_RG16F:
case FORMAT_RGBA16F:
case FORMAT_RG11B10F: // FIXME: Conversions aren't supported in GLES
datatype = GL_HALF_FLOAT;
imageformat = image::ImageData::FORMAT_RGBA16F;
break;
case FORMAT_R32F:
case FORMAT_RG32F:
case FORMAT_RGBA32F:
datatype = GL_FLOAT;
imageformat = image::ImageData::FORMAT_RGBA32F;
break;
default:
break;
}
int size = w * h * image::ImageData::getPixelSize(imageformat);
uint8 *pixels = nullptr;
try try
{ {
pixels = new GLubyte[size]; pixels = new uint8[size];
} }
catch (std::bad_alloc &) catch (std::bad_alloc &)
{ {
@@ -627,13 +652,13 @@ love::image::ImageData *Canvas::newImageData(love::image::Image *image, int x, i
else else
gl.bindFramebuffer(GL_FRAMEBUFFER, fbo); gl.bindFramebuffer(GL_FRAMEBUFFER, fbo);
glReadPixels(x, y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glReadPixels(x, y, w, h, GL_RGBA, datatype, pixels);
GLuint prevfbo = current ? current->fbo : gl.getDefaultFBO(); GLuint prevfbo = current ? current->fbo : gl.getDefaultFBO();
gl.bindFramebuffer(GL_FRAMEBUFFER, prevfbo); gl.bindFramebuffer(GL_FRAMEBUFFER, prevfbo);
// The new ImageData now owns the pixel data, so we don't delete it here. // The new ImageData now owns the pixel data, so we don't delete it here.
return image->newImageData(w, h, image::ImageData::FORMAT_RGBA8, pixels, true); return image->newImageData(w, h, imageformat, pixels, true);
} }
bool Canvas::resolveMSAA(bool restoreprev) bool Canvas::resolveMSAA(bool restoreprev)