enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

now work? 

SVN revision: 50635
This commit is contained in:
Carsten Haitzler 2010-07-29 06:21:51 +00:00
parent 29e957d6a7
commit f20b010d41
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,7 @@ eng_setup(Evas *e, void *in)
if (re->win)
{
re->win->gl_context->shared->references++;
re->win->gl_context->references++;
eng_window_free(re->win);
inc = 1;
gl_wins--;
@ -348,7 +348,7 @@ eng_setup(Evas *e, void *in)
info->info.rotation);
if (re->win) gl_wins++;
if ((re->win) && (inc))
re->win->gl_context->shared->references--;
re->win->gl_context->references--;
}
else if ((re->win->w != e->output.w) ||
(re->win->h != e->output.h))

11
legacy/evas/src/modules/engines/gl_x11/evas_x_main.c
View File

@ -395,14 +395,19 @@ eng_window_new(Display *disp,
void
eng_window_free(Evas_GL_X11_Window *gw)
{
int ref = 0;
win_count--;
eng_window_use(gw);
if (gw == _evas_gl_x11_window) _evas_gl_x11_window = NULL;
if (gw->gl_context) evas_gl_common_context_free(gw->gl_context);
if (gw->gl_context)
{
ref = gw->gl_context->references;
evas_gl_common_context_free(gw->gl_context);
}
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
if (gw->egl_surface[0] != EGL_NO_SURFACE)
eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
if (win_count == 0)
if (ref == 0)
{
if (context) eglDestroyContext(gw->egl_disp, context);
eglTerminate(gw->egl_disp);
@ -411,7 +416,7 @@ eng_window_free(Evas_GL_X11_Window *gw)
eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
#else
if (gw->glxwin) glXDestroyWindow(gw->disp, gw->glxwin);
if (win_count == 0)
if (ref == 0)
{
if (context) glXDestroyContext(gw->disp, context);
if (rgba_context) glXDestroyContext(gw->disp, rgba_context);