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

fix! broek egl compositing. fixed now. 

SVN revision: 45792
This commit is contained in:
Carsten Haitzler 2010-02-02 05:30:19 +00:00
parent 743bc86799
commit 2087f9468c
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_common/evas_gl_context.c
View File

@ -916,7 +916,7 @@ shader_array_flush(Evas_GL_Context *gc)
}
if (gc->array.im)
{
if (!gc->array.im->native.func.bind)
if (!gc->array.im->native.loose)
{
if (gc->array.im->native.func.bind)
gc->array.im->native.func.bind(gc->array.im->native.func.data,
@ -1054,7 +1054,7 @@ shader_array_flush(Evas_GL_Context *gc)
}
if (gc->array.im)
{
if (!gc->array.im->native.func.bind)
if (!gc->array.im->native.loose)
{
if (gc->array.im->native.func.unbind)
gc->array.im->native.func.unbind(gc->array.im->native.func.data,

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

@ -429,6 +429,11 @@ eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x
re->win->draw.redraw = 0;
re->win->draw.drew = 1;
evas_gl_common_context_flush(re->win->gl_context);
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
eglWaitGL(); // previous rendering should be done and swapped
#else
glXWaitGL();
#endif
//x// printf("frame -> push\n");
}
@ -444,8 +449,8 @@ eng_output_flush(void *data)
eng_window_use(re->win);
#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
// glFlush();
eglSwapBuffers(re->win->egl_disp, re->win->egl_surface[0]);
eglWaitGL(); // excessive - swapbuffers should wait in windowed mode
#else
#ifdef VSYNC_TO_SCREEN
if (re->info->vsync)
@ -461,13 +466,11 @@ eng_output_flush(void *data)
# endif
if (re->info->callback.pre_swap)
{
glFinish();
re->info->callback.pre_swap(re->info->callback.data, re->evas);
}
glXSwapBuffers(re->win->disp, re->win->win);
if (re->info->callback.post_swap)
{
glXWaitGL();
re->info->callback.post_swap(re->info->callback.data, re->evas);
}
#endif
@ -1285,6 +1288,8 @@ eng_image_native_set(void *data, void *image, void *native)
im->native.func.bind = _native_bind_cb;
im->native.func.unbind = _native_unbind_cb;
im->native.func.free = _native_free_cb;
im->native.target = GL_TEXTURE_2D;
im->native.mipmap = 0;
#if 0 // old texfrompixmap
n->egl_surface = eglCreatePixmapSurface(re->win->egl_disp,
egl_config, pm,