summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-05-13 10:48:43 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-05-13 10:48:43 +0900
commit22e210e5ae894100cc129f0245913d6d86bc6d8e (patch)
tree5f217e7cb7131b0877542fea57748b35921f69c9
parenta1ea4a417fc7bea3df70d71241f95aeaaf702aae (diff)
Evas filters: Fix glReadPixels usage for EGL
This is a simplified version of the patch in master: commit 7a614c80f3022c4da06bd299d25bc6433caab00a Author: Jean-Philippe Andre <jp.andre@samsung.com> Date: Wed May 13 10:16:17 2015 +0900 Evas filters: Fix glReadPixels usage for EGL EGL might very well not support RGBA read mode, so we need to check for it first. Also remove some error logs (see previous commit), and useless initialization of the Evas GL engine. @fix
-rw-r--r--src/modules/evas/engines/gl_generic/evas_engine.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index e280fddf91..3849331b0d 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1343,9 +1343,13 @@ eng_gl_surface_read_pixels(void *data, void *surface,
1343 */ 1343 */
1344 1344
1345 glsym_glBindFramebuffer(GL_FRAMEBUFFER, im->tex->pt->fb); 1345 glsym_glBindFramebuffer(GL_FRAMEBUFFER, im->tex->pt->fb);
1346
1347#ifndef GL_GLES
1346 if (im->tex->pt->format == GL_BGRA) 1348 if (im->tex->pt->format == GL_BGRA)
1347 glReadPixels(x, y, w, h, GL_BGRA, GL_UNSIGNED_BYTE, pixels); 1349 glReadPixels(x, y, w, h, GL_BGRA, GL_UNSIGNED_BYTE, pixels);
1348 else 1350 else
1351#endif
1352
1349 { 1353 {
1350 DATA32 *ptr = pixels; 1354 DATA32 *ptr = pixels;
1351 int k; 1355 int k;