From e93998a181c6686d766bfdeb0191d7a8e673cd58 Mon Sep 17 00:00:00 2001 From: raster Date: Fri, 13 Aug 2010 11:08:57 +0000 Subject: [PATCH] and make it work... yes. first time sec egl image works. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@51072 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/gl_common/evas_gl_image.c | 3 +-- src/modules/engines/gl_common/evas_gl_texture.c | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/engines/gl_common/evas_gl_image.c b/src/modules/engines/gl_common/evas_gl_image.c index 0951c75..c06d170 100644 --- a/src/modules/engines/gl_common/evas_gl_image.c +++ b/src/modules/engines/gl_common/evas_gl_image.c @@ -276,13 +276,12 @@ evas_gl_common_image_scale_hint_set(Evas_GL_Image *im, int hint) void evas_gl_common_image_content_hint_set(Evas_GL_Image *im, int hint) { - im->content_hint = hint; if (im->content_hint == hint) return; + im->content_hint = hint; if (!im->gc) return; if (!im->gc->shared->info.sec_image_map) return; // does not handle yuv yet. if (im->cs.space != EVAS_COLORSPACE_ARGB8888) return; - return; if (im->content_hint == EVAS_IMAGE_CONTENT_HINT_DYNAMIC) { if (im->cs.data) diff --git a/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/engines/gl_common/evas_gl_texture.c index 80e160c..a5d8257 100644 --- a/src/modules/engines/gl_common/evas_gl_texture.c +++ b/src/modules/engines/gl_common/evas_gl_texture.c @@ -410,8 +410,7 @@ _pool_tex_dynamic_new(Evas_GL_Context *gc, int w, int h, int intformat, int form EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC, EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC, EGL_NONE }; - void *egldisplay = pt->gc->egldisp; - + void *egldisplay; pt = calloc(1, sizeof(Evas_GL_Texture_Pool)); if (!pt) return NULL; @@ -438,13 +437,17 @@ _pool_tex_dynamic_new(Evas_GL_Context *gc, int w, int h, int intformat, int form glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); GLERR(__FUNCTION__, __FILE__, __LINE__, ""); + egldisplay = pt->gc->egldisp; + attr[1] = pt->w; - attr[2] = pt->h; + attr[3] = pt->h; + printf("make egl image for %p... %ix%i\n", pt, pt->w, pt->h); pt->dyn.img = secsym_eglCreateImage(egldisplay, EGL_NO_CONTEXT, EGL_MAP_GL_TEXTURE_2D_SEC, 0, attr); + printf("pt->dyn.img = %p\n", pt->dyn.img); if (!pt->dyn.img) { GLERR(__FUNCTION__, __FILE__, __LINE__, ""); -- 2.7.4