From e614942a2d52ea79c3a7f0fda4f0357035a6cc53 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 11 Dec 2019 23:22:10 +0100 Subject: [PATCH] Read texture data as RGBA from FBO on GLES 2.0 --- src/rlgl.h | 12 +++--------- src/textures.c | 11 ++++++----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index 681db962d..9a746873e 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -2904,15 +2904,9 @@ void *rlReadTexturePixels(Texture2D texture) // NOTE: Previoust attached texture is automatically detached glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture.id, 0); - // Allocate enough memory to read back our texture data - pixels = (unsigned char *)RL_MALLOC(GetPixelDataSize(texture.width, texture.height, texture.format)); - - // Get OpenGL internal formats and data type from our texture format - unsigned int glInternalFormat, glFormat, glType; - rlGetGlTextureFormats(texture.format, &glInternalFormat, &glFormat, &glType); - - // NOTE: We read data as RGBA because FBO texture is configured as RGBA, despite binding a RGB texture... - glReadPixels(0, 0, texture.width, texture.height, glFormat, glType, pixels); + // We read data as RGBA because FBO texture is configured as RGBA, despite binding another texture format + pixels = (unsigned char *)RL_MALLOC(GetPixelDataSize(texture.width, texture.height, UNCOMPRESSED_R8G8B8A8)); + glReadPixels(0, 0, texture.width, texture.height, UNCOMPRESSED_R8G8B8A8, GL_UNSIGNED_BYTE, pixels); // Re-attach internal FBO color texture before deleting it glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbo.texture.id, 0); diff --git a/src/textures.c b/src/textures.c index ed6b8e6a5..ba90c3204 100644 --- a/src/textures.c +++ b/src/textures.c @@ -773,11 +773,12 @@ Image GetTextureData(Texture2D texture) image.format = texture.format; image.mipmaps = 1; - // NOTE: Data retrieved on OpenGL ES 2.0 should be RGBA - // coming from FBO color buffer, but it seems original - // texture format is retrieved on RPI... weird... - //image.format = UNCOMPRESSED_R8G8B8A8; - +#if defined(GRAPHICS_API_OPENGL_ES2) + // NOTE: Data retrieved on OpenGL ES 2.0 should be RGBA, + // coming from FBO color buffer attachment, but it seems + // original texture format is retrieved on RPI... + image.format = UNCOMPRESSED_R8G8B8A8; +#endif TraceLog(LOG_INFO, "Texture pixel data obtained successfully"); } else TraceLog(LOG_WARNING, "Texture pixel data could not be obtained");