dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

can't reproduce but try avoid possible alloc bug in native surface 

handling.



SVN revision: 74993
This commit is contained in:
Carsten Haitzler 2012-08-08 06:25:59 +00:00
parent 20f5fcaa3e
commit 6cfcf9ef49
1 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
legacy/evas/src/modules/engines/gl_x11/evas_engine.c
View File

@ -2135,6 +2135,7 @@ eng_image_native_set(void *data, void *image, void *native)
EVAS_COLORSPACE_ARGB8888); EVAS_COLORSPACE_ARGB8888);
evas_gl_common_image_free(im); evas_gl_common_image_free(im);
im = im2; im = im2;
if (!im) return NULL;
if (ns->type == EVAS_NATIVE_SURFACE_X11) if (ns->type == EVAS_NATIVE_SURFACE_X11)
{ {
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
@ -2149,6 +2150,7 @@ eng_image_native_set(void *data, void *image, void *native)
eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im); eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im);
// assume 32bit pixmap! :)
config_attrs[i++] = EGL_RED_SIZE; config_attrs[i++] = EGL_RED_SIZE;
config_attrs[i++] = 8; config_attrs[i++] = 8;
config_attrs[i++] = EGL_GREEN_SIZE; config_attrs[i++] = EGL_GREEN_SIZE;
@ -2197,116 +2199,115 @@ eng_image_native_set(void *data, void *image, void *native)
} }
#else #else
# ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT # ifdef GLX_BIND_TO_TEXTURE_TARGETS_EXT
if (native) if (native)
{ {
int dummy; int dummy;
unsigned int w, h, depth = 32, border; unsigned int w, h, depth = 32, border;
Window wdummy; Window wdummy;
// fixme: round trip :( // fixme: round trip :(
XGetGeometry(re->win->disp, pm, &wdummy, &dummy, &dummy, XGetGeometry(re->win->disp, pm, &wdummy, &dummy, &dummy,
&w, &h, &border, &depth); &w, &h, &border, &depth);
n = calloc(1, sizeof(Native)); if (depth <= 32)
if (n) {
{ n = calloc(1, sizeof(Native));
int pixmap_att[20]; if (n)
unsigned int target = 0; {
unsigned int i = 0; int pixmap_att[20];
unsigned int target = 0;
eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im); unsigned int i = 0;
if ((re->win->depth_cfg[depth].tex_target &
GLX_TEXTURE_2D_BIT_EXT) eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im);
// && (1) // we assume npo2 for now if ((re->win->depth_cfg[depth].tex_target &
// size is pow2 || mnpo2 supported GLX_TEXTURE_2D_BIT_EXT))
) target = GLX_TEXTURE_2D_EXT;
target = GLX_TEXTURE_2D_EXT; else if ((re->win->depth_cfg[depth].tex_target &
else if ((re->win->depth_cfg[depth].tex_target & GLX_TEXTURE_RECTANGLE_BIT_EXT))
GLX_TEXTURE_RECTANGLE_BIT_EXT)) {
{ ERR("rect!!! (not handled)");
ERR("rect!!! (not handled)"); target = GLX_TEXTURE_RECTANGLE_EXT;
target = GLX_TEXTURE_RECTANGLE_EXT; }
} if (!target)
if (!target) {
{ ERR("broken tex-from-pixmap");
ERR("broken text-from-pixmap"); if (!(re->win->depth_cfg[depth].tex_target &
if (!(re->win->depth_cfg[depth].tex_target & GLX_TEXTURE_2D_BIT_EXT))
GLX_TEXTURE_2D_BIT_EXT)) target = GLX_TEXTURE_RECTANGLE_EXT;
target = GLX_TEXTURE_RECTANGLE_EXT; else if (!(re->win->depth_cfg[depth].tex_target &
else if (!(re->win->depth_cfg[depth].tex_target & GLX_TEXTURE_RECTANGLE_BIT_EXT))
GLX_TEXTURE_RECTANGLE_BIT_EXT)) target = GLX_TEXTURE_2D_EXT;
target = GLX_TEXTURE_2D_EXT; }
}
pixmap_att[i++] = GLX_TEXTURE_FORMAT_EXT;
pixmap_att[i++] = re->win->depth_cfg[depth].tex_format;
pixmap_att[i++] = GLX_TEXTURE_FORMAT_EXT; pixmap_att[i++] = GLX_MIPMAP_TEXTURE_EXT;
pixmap_att[i++] = re->win->depth_cfg[depth].tex_format; pixmap_att[i++] = re->win->depth_cfg[depth].mipmap;
pixmap_att[i++] = GLX_MIPMAP_TEXTURE_EXT;
pixmap_att[i++] = re->win->depth_cfg[depth].mipmap; if (target)
{
if (target) pixmap_att[i++] = GLX_TEXTURE_TARGET_EXT;
{ pixmap_att[i++] = target;
pixmap_att[i++] = GLX_TEXTURE_TARGET_EXT; }
pixmap_att[i++] = target;
} pixmap_att[i++] = 0;
pixmap_att[i++] = 0; memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
n->pixmap = pm;
memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface)); n->visual = vis;
n->pixmap = pm; n->fbc = re->win->depth_cfg[depth].fbc;
n->visual = vis; if (glsym_glXCreatePixmap)
n->fbc = re->win->depth_cfg[depth].fbc; n->glx_pixmap = glsym_glXCreatePixmap(re->win->disp,
if (glsym_glXCreatePixmap) n->fbc,
n->glx_pixmap = glsym_glXCreatePixmap(re->win->disp, n->pixmap,
n->fbc, pixmap_att);
n->pixmap, else
pixmap_att); ERR("Try glXCreatePixmap on GLX with no support");
else if (n->glx_pixmap)
ERR("Try glXCreatePixmap on GLX with no support"); {
if (n->glx_pixmap) // printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n",
{ // n, pm, w, h, depth, n->glx_pixmap);
// printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n", if (!target)
// n, pm, w, h, depth, n->glx_pixmap); {
if (!target) ERR("no target :(");
{ if (glsym_glXQueryDrawable)
ERR("no target :("); glsym_glXQueryDrawable(re->win->disp,
if (glsym_glXQueryDrawable) n->pixmap,
glsym_glXQueryDrawable(re->win->disp, GLX_TEXTURE_TARGET_EXT,
n->pixmap, &target);
GLX_TEXTURE_TARGET_EXT, }
&target); if (target == GLX_TEXTURE_2D_EXT)
} {
if (target == GLX_TEXTURE_2D_EXT) im->native.target = GL_TEXTURE_2D;
{ im->native.mipmap = re->win->depth_cfg[depth].mipmap;
im->native.target = GL_TEXTURE_2D; }
im->native.mipmap = re->win->depth_cfg[depth].mipmap;
}
# ifdef GL_TEXTURE_RECTANGLE_ARB # ifdef GL_TEXTURE_RECTANGLE_ARB
else if (target == GLX_TEXTURE_RECTANGLE_EXT) else if (target == GLX_TEXTURE_RECTANGLE_EXT)
{ {
im->native.target = GL_TEXTURE_RECTANGLE_ARB; im->native.target = GL_TEXTURE_RECTANGLE_ARB;
im->native.mipmap = 0; im->native.mipmap = 0;
} }
# endif # endif
else else
{ {
im->native.target = GL_TEXTURE_2D; im->native.target = GL_TEXTURE_2D;
im->native.mipmap = 0; im->native.mipmap = 0;
ERR("still unknown target"); ERR("still unknown target");
} }
} }
else else
ERR("GLX Pixmap create fail"); ERR("GLX Pixmap create fail");
im->native.yinvert = re->win->depth_cfg[depth].yinvert; im->native.yinvert = re->win->depth_cfg[depth].yinvert;
im->native.loose = re->win->detected.loose_binding; im->native.loose = re->win->detected.loose_binding;
im->native.data = n; im->native.data = n;
im->native.func.data = re; im->native.func.data = re;
im->native.func.bind = _native_bind_cb; im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb; im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb; im->native.func.free = _native_free_cb;
evas_gl_common_image_native_enable(im); evas_gl_common_image_native_enable(im);
} }
} }
}
# endif # endif
#endif #endif
} }