summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/gl_common
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-04-13 21:29:37 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-04-14 16:37:12 +0900
commit99347e91789217a294172cb670b349fb6eb1c5d9 (patch)
tree46410f6e19815c5cf9f1c49973b28b922b814cb6 /src/modules/evas/engines/gl_common
parent78cd7336aaa6b063cc76b7bf6fb9d866186bc83f (diff)
Evas GL common: Fix texture preload with RGB+Alpha
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 0db548538a..a8f95ed253 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -519,9 +519,7 @@ evas_gl_common_texture_new(Evas_Engine_GL_Context *gc, RGBA_Image *im)
519 yoffset = im->cache_entry.borders.t; 519 yoffset = im->cache_entry.borders.t;
520 break; 520 break;
521 case EVAS_COLORSPACE_ETC1_ALPHA: 521 case EVAS_COLORSPACE_ETC1_ALPHA:
522 // One must call evas_gl_common_texture_rgb_a_pair_new() instead. 522 return evas_gl_common_texture_rgb_a_pair_new(gc, im);
523 ERR("Trying to upload ETC1+Alpha texture as a normal texture. Abort.");
524 return NULL;
525 default: 523 default:
526 // One pixel gap and two pixels for duplicated borders 524 // One pixel gap and two pixels for duplicated borders
527 w = im->cache_entry.w + 3; 525 w = im->cache_entry.w + 3;