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

and now REALLY fix that viewport bug... 

SVN revision: 58386
This commit is contained in:
Carsten Haitzler 2011-04-06 10:11:01 +00:00
parent 4a982fb26e
commit fe933e7b34
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
View File

@ -848,7 +848,7 @@ evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
{ {
if (_evas_gl_common_context == gc) return; if (_evas_gl_common_context == gc) return;
_evas_gl_common_context = gc; _evas_gl_common_context = gc;
_evas_gl_common_viewport_set(gc); if (gc) _evas_gl_common_viewport_set(gc);
} }
void void

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

@ -423,6 +423,7 @@ eng_setup(Evas *e, void *in)
re->info->indirect, re->info->indirect,
re->info->info.destination_alpha, re->info->info.destination_alpha,
re->info->info.rotation); re->info->info.rotation);
eng_window_use(re->win);
if (re->win) gl_wins++; if (re->win) gl_wins++;
if ((re->win) && (inc)) if ((re->win) && (inc))
re->win->gl_context->references--; re->win->gl_context->references--;

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

@ -214,7 +214,6 @@ eng_window_new(Display *disp,
eng_window_free(gw); eng_window_free(gw);
return NULL; return NULL;
} }
_evas_gl_x11_window = gw;
vendor = glGetString(GL_VENDOR); vendor = glGetString(GL_VENDOR);
renderer = glGetString(GL_RENDERER); renderer = glGetString(GL_RENDERER);
@ -500,7 +499,6 @@ eng_window_new(Display *disp,
} }
} }
#endif #endif
_evas_gl_x11_window = gw;
gw->gl_context = evas_gl_common_context_new(); gw->gl_context = evas_gl_common_context_new();
if (!gw->gl_context) if (!gw->gl_context)
@ -511,7 +509,7 @@ eng_window_new(Display *disp,
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
gw->gl_context->egldisp = gw->egl_disp; gw->gl_context->egldisp = gw->egl_disp;
#endif #endif
evas_gl_common_context_use(gw->gl_context); eng_window_use(gw);
evas_gl_common_context_resize(gw->gl_context, w, h, rot); evas_gl_common_context_resize(gw->gl_context, w, h, rot);
gw->surf = 1; gw->surf = 1;
return gw; return gw;
@ -525,13 +523,13 @@ eng_window_free(Evas_GL_X11_Window *gw)
eng_window_use(gw); eng_window_use(gw);
if (gw == _evas_gl_x11_window) _evas_gl_x11_window = NULL; if (gw == _evas_gl_x11_window) _evas_gl_x11_window = NULL;
if (gw->gl_context) if (gw->gl_context)
{ {
ref = gw->gl_context->references - 1; ref = gw->gl_context->references - 1;
evas_gl_common_context_free(gw->gl_context); evas_gl_common_context_free(gw->gl_context);
} }
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
if (gw->egl_surface[0] != EGL_NO_SURFACE) if (gw->egl_surface[0] != EGL_NO_SURFACE)
eglDestroySurface(gw->egl_disp, gw->egl_surface[0]); eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
if (ref == 0) if (ref == 0)
{ {
if (context) eglDestroyContext(gw->egl_disp, context); if (context) eglDestroyContext(gw->egl_disp, context);
@ -539,7 +537,6 @@ eng_window_free(Evas_GL_X11_Window *gw)
context = EGL_NO_CONTEXT; context = EGL_NO_CONTEXT;
} }
eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(gw->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
evas_gl_common_context_use(NULL);
#else #else
if (gw->glxwin) glXDestroyWindow(gw->disp, gw->glxwin); if (gw->glxwin) glXDestroyWindow(gw->disp, gw->glxwin);
if (ref == 0) if (ref == 0)
@ -581,7 +578,10 @@ eng_window_use(Evas_GL_X11_Window *gw)
if ((_evas_gl_x11_window != gw) || (force_use)) if ((_evas_gl_x11_window != gw) || (force_use))
{ {
if (_evas_gl_x11_window) if (_evas_gl_x11_window)
evas_gl_common_context_flush(_evas_gl_x11_window->gl_context); {
evas_gl_common_context_use(_evas_gl_x11_window->gl_context);
evas_gl_common_context_flush(_evas_gl_x11_window->gl_context);
}
_evas_gl_x11_window = gw; _evas_gl_x11_window = gw;
if (gw) if (gw)
{ {
@ -637,7 +637,6 @@ eng_window_unsurf(Evas_GL_X11_Window *gw)
eglDestroySurface(gw->egl_disp, gw->egl_surface[0]); eglDestroySurface(gw->egl_disp, gw->egl_surface[0]);
gw->egl_surface[0] = EGL_NO_SURFACE; gw->egl_surface[0] = EGL_NO_SURFACE;
_evas_gl_x11_window = NULL; _evas_gl_x11_window = NULL;
evas_gl_common_context_use(NULL);
} }
#else #else
if (gw->glxwin) if (gw->glxwin)