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

evas: make gl_x11 rely on gl_generic. 

Note that we can't access gl_common directly as it is not possible to link it
2 times. I also didn't want to force evas to be linked with GL/EGL. So I rely
now on dlsym on about 20 symbols to get that backend going.
This commit is contained in:
Cedric BAIL 2014-07-11 15:16:03 +02:00
parent 79ea41b205
commit cec904cd03
4 changed files with 303 additions and 1826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/evas/engines/gl_common/evas_gl_core_private.h
View File

@ -242,7 +242,7 @@ struct _EVGL_Engine
{ {
int initted; int initted;
EVGL_Interface *funcs; const EVGL_Interface *funcs;
EVGL_Cap caps; EVGL_Cap caps;

2033
src/modules/evas/engines/gl_x11/evas_engine.c
View File

File diff suppressed because it is too large Load Diff

25
src/modules/evas/engines/gl_x11/evas_engine.h
View File

@ -4,7 +4,6 @@
#include "config.h" #include "config.h"
#include "evas_common_private.h" #include "evas_common_private.h"
#include "evas_private.h" #include "evas_private.h"
#include "evas_gl_common.h"
#include "Evas.h" #include "Evas.h"
#include "Evas_Engine_GL_X11.h" #include "Evas_Engine_GL_X11.h"
@ -31,7 +30,7 @@
# include <GL/glx.h> # include <GL/glx.h>
#endif #endif
#include "../software_generic/Evas_Engine_Software_Generic.h" #include "../gl_generic/Evas_Engine_GL_Generic.h"
extern int _evas_engine_GL_X11_log_dom ; extern int _evas_engine_GL_X11_log_dom ;
#ifdef ERR #ifdef ERR
@ -60,7 +59,6 @@ extern int _evas_engine_GL_X11_log_dom ;
#define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__) #define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_GL_X11_log_dom, __VA_ARGS__)
typedef struct _Outbuf Outbuf; typedef struct _Outbuf Outbuf;
typedef struct _Evas_GL_X11_Context Evas_GL_X11_Context;
struct _Outbuf struct _Outbuf
{ {
@ -105,7 +103,7 @@ struct _Outbuf
} draw; } draw;
}; };
struct _Evas_GL_X11_Context struct _Context_3D
{ {
#ifdef GL_GLES #ifdef GL_GLES
EGLDisplay display; EGLDisplay display;
@ -125,6 +123,17 @@ extern int swap_buffer_debug_mode;
extern int swap_buffer_debug; extern int swap_buffer_debug;
extern const char *debug_dir; extern const char *debug_dir;
extern Evas_GL_Common_Context_New glsym_evas_gl_common_context_new;
extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_flush;
extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_free;
extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_use;
extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_newframe;
extern Evas_GL_Common_Context_Call glsym_evas_gl_common_context_done;
extern Evas_GL_Common_Context_Resize_Call glsym_evas_gl_common_context_resize;
extern Evas_GL_Common_Buffer_Dump_Call glsym_evas_gl_common_buffer_dump;
extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_lock;
extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock;
#ifdef GL_GLES #ifdef GL_GLES
#ifndef EGL_BUFFER_AGE_EXT #ifndef EGL_BUFFER_AGE_EXT
@ -162,9 +171,9 @@ void *eng_best_visual_get(Evas_Engine_Info_GL_X11 *einfo);
Colormap eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo); Colormap eng_best_colormap_get(Evas_Engine_Info_GL_X11 *einfo);
int eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo); int eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo);
Evas_GL_X11_Context *eng_gl_context_new(Outbuf *win); Context_3D *eng_gl_context_new(Outbuf *win);
void eng_gl_context_free(Evas_GL_X11_Context *context); void eng_gl_context_free(Context_3D *context);
void eng_gl_context_use(Evas_GL_X11_Context *context); void eng_gl_context_use(Context_3D *context);
void eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth); void eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth);
int eng_outbuf_get_rot(Outbuf *ob); int eng_outbuf_get_rot(Outbuf *ob);
@ -177,6 +186,8 @@ void eng_outbuf_push_free_region_for_update(Outbuf *ob, RGBA_Image *update);
void eng_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, void eng_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update,
int x, int y, int w, int h); int x, int y, int w, int h);
void eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode); void eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode);
Evas_Engine_GL_Context *eng_outbuf_gl_context_get(Outbuf *ob);
void *eng_outbuf_egl_display_get(Outbuf *ob);
Eina_Bool eng_preload_make_current(void *data, void *doit); Eina_Bool eng_preload_make_current(void *data, void *doit);

69
src/modules/evas/engines/gl_x11/evas_x_main.c
View File

@ -404,7 +404,7 @@ eng_window_new(Evas_Engine_Info_GL_X11 *info,
} }
#endif #endif
gw->gl_context = evas_gl_common_context_new(); gw->gl_context = glsym_evas_gl_common_context_new();
if (!gw->gl_context) if (!gw->gl_context)
{ {
eng_window_free(gw); eng_window_free(gw);
@ -415,7 +415,7 @@ eng_window_new(Evas_Engine_Info_GL_X11 *info,
gw->gl_context->eglctxt = gw->egl_context[0]; gw->gl_context->eglctxt = gw->egl_context[0];
#endif #endif
eng_window_use(gw); eng_window_use(gw);
evas_gl_common_context_resize(gw->gl_context, w, h, rot); glsym_evas_gl_common_context_resize(gw->gl_context, w, h, rot);
gw->surf = 1; gw->surf = 1;
return gw; return gw;
(void) (indirect = 0); (void) (indirect = 0);
@ -431,7 +431,7 @@ eng_window_free(Outbuf *gw)
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); glsym_evas_gl_common_context_free(gw->gl_context);
} }
#ifdef GL_GLES #ifdef GL_GLES
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);
@ -511,7 +511,7 @@ eng_window_use(Outbuf *gw)
{ {
Eina_Bool force_use = EINA_FALSE; Eina_Bool force_use = EINA_FALSE;
evas_gl_preload_render_lock(eng_window_make_current, gw); glsym_evas_gl_preload_render_lock(eng_window_make_current, gw);
#ifdef GL_GLES #ifdef GL_GLES
if (_evas_gl_x11_window) if (_evas_gl_x11_window)
{ {
@ -529,8 +529,8 @@ eng_window_use(Outbuf *gw)
{ {
if (_evas_gl_x11_window) if (_evas_gl_x11_window)
{ {
evas_gl_common_context_use(_evas_gl_x11_window->gl_context); glsym_evas_gl_common_context_use(_evas_gl_x11_window->gl_context);
evas_gl_common_context_flush(_evas_gl_x11_window->gl_context); glsym_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)
@ -567,7 +567,7 @@ eng_window_use(Outbuf *gw)
#endif #endif
} }
} }
if (gw) evas_gl_common_context_use(gw->gl_context); if (gw) glsym_evas_gl_common_context_use(gw->gl_context);
} }
void void
@ -579,7 +579,7 @@ eng_window_unsurf(Outbuf *gw)
printf("unsurf %p\n", gw); printf("unsurf %p\n", gw);
#ifdef GL_GLES #ifdef GL_GLES
if (_evas_gl_x11_window) if (_evas_gl_x11_window)
evas_gl_common_context_flush(_evas_gl_x11_window->gl_context); glsym_evas_gl_common_context_flush(_evas_gl_x11_window->gl_context);
if (_evas_gl_x11_window == gw) if (_evas_gl_x11_window == gw)
{ {
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);
@ -856,17 +856,17 @@ eng_best_depth_get(Evas_Engine_Info_GL_X11 *einfo)
return _evas_gl_x11_vi->depth; return _evas_gl_x11_vi->depth;
} }
Evas_GL_X11_Context * Context_3D *
eng_gl_context_new(Outbuf *win) eng_gl_context_new(Outbuf *win)
{ {
Evas_GL_X11_Context *ctx; Context_3D *ctx;
#if GL_GLES #if GL_GLES
int context_attrs[3] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; int context_attrs[3] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
#endif #endif
if (!win) return NULL; if (!win) return NULL;
ctx = calloc(1, sizeof(Evas_GL_X11_Context)); ctx = calloc(1, sizeof(Context_3D));
if (!ctx) return NULL; if (!ctx) return NULL;
#if GL_GLES #if GL_GLES
@ -903,7 +903,7 @@ error:
} }
void void
eng_gl_context_free(Evas_GL_X11_Context *ctx) eng_gl_context_free(Context_3D *ctx)
{ {
#if GL_GLES #if GL_GLES
eglDestroyContext(ctx->display, ctx->context); eglDestroyContext(ctx->display, ctx->context);
@ -915,7 +915,7 @@ eng_gl_context_free(Evas_GL_X11_Context *ctx)
} }
void void
eng_gl_context_use(Evas_GL_X11_Context *ctx) eng_gl_context_use(Context_3D *ctx)
{ {
#if GL_GLES #if GL_GLES
if (eglMakeCurrent(ctx->display, ctx->surface, if (eglMakeCurrent(ctx->display, ctx->surface,
@ -953,7 +953,7 @@ eng_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth EIN
ob->h = h; ob->h = h;
ob->rot = rot; ob->rot = rot;
eng_window_use(ob); eng_window_use(ob);
evas_gl_common_context_resize(ob->gl_context, w, h, rot); glsym_evas_gl_common_context_resize(ob->gl_context, w, h, rot);
} }
int int
@ -1011,7 +1011,7 @@ eng_outbuf_region_first_rect(Outbuf *ob)
{ {
ob->gl_context->preserve_bit = GL_COLOR_BUFFER_BIT0_QCOM; ob->gl_context->preserve_bit = GL_COLOR_BUFFER_BIT0_QCOM;
evas_gl_preload_render_lock(eng_preload_make_current, ob); glsym_evas_gl_preload_render_lock(eng_preload_make_current, ob);
#ifdef GL_GLES #ifdef GL_GLES
// dont need to for egl - eng_window_use() can check for other ctxt's // dont need to for egl - eng_window_use() can check for other ctxt's
#else #else
@ -1020,12 +1020,12 @@ eng_outbuf_region_first_rect(Outbuf *ob)
eng_window_use(ob); eng_window_use(ob);
if (!_re_wincheck(ob)) return EINA_TRUE; if (!_re_wincheck(ob)) return EINA_TRUE;
evas_gl_common_context_resize(ob->gl_context, glsym_evas_gl_common_context_resize(ob->gl_context,
ob->w, ob->h, ob->w, ob->h,
ob->rot); ob->rot);
evas_gl_common_context_flush(ob->gl_context); glsym_evas_gl_common_context_flush(ob->gl_context);
evas_gl_common_context_newframe(ob->gl_context); glsym_evas_gl_common_context_newframe(ob->gl_context);
if (partial_render_debug == 1) if (partial_render_debug == 1)
{ {
glClearColor(0.2, 0.5, 1.0, 1.0); glClearColor(0.2, 0.5, 1.0, 1.0);
@ -1064,7 +1064,7 @@ eng_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update EINA_UNUSED,
still do that for the full canvas when doing partial update */ still do that for the full canvas when doing partial update */
if (!_re_wincheck(ob)) return; if (!_re_wincheck(ob)) return;
ob->draw.drew = 1; ob->draw.drew = 1;
evas_gl_common_context_flush(ob->gl_context); glsym_evas_gl_common_context_flush(ob->gl_context);
#ifdef GL_GLES #ifdef GL_GLES
// this is needed to make sure all previous rendering is flushed to // this is needed to make sure all previous rendering is flushed to
// buffers/surfaces // buffers/surfaces
@ -1097,7 +1097,7 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode)
ob->draw.drew = 0; ob->draw.drew = 0;
eng_window_use(ob); eng_window_use(ob);
evas_gl_common_context_done(ob->gl_context); glsym_evas_gl_common_context_done(ob->gl_context);
// Save contents of the framebuffer to a file // Save contents of the framebuffer to a file
if (swap_buffer_debug_mode == 1) if (swap_buffer_debug_mode == 1)
@ -1108,11 +1108,11 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode)
int ret = 0; int ret = 0;
snprintf(fname, sizeof(fname), "%p", (void*)ob); snprintf(fname, sizeof(fname), "%p", (void*)ob);
ret = evas_gl_common_buffer_dump(ob->gl_context, ret = glsym_evas_gl_common_buffer_dump(ob->gl_context,
(const char*)debug_dir, (const char*)debug_dir,
(const char*)fname, (const char*)fname,
ob->frame_cnt, ob->frame_cnt,
NULL); NULL);
if (!ret) swap_buffer_debug_mode = 0; if (!ret) swap_buffer_debug_mode = 0;
} }
} }
@ -1249,5 +1249,22 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode)
ob->frame_cnt++; ob->frame_cnt++;
end: end:
evas_gl_preload_render_unlock(eng_preload_make_current, ob); glsym_evas_gl_preload_render_unlock(eng_preload_make_current, ob);
}
Evas_Engine_GL_Context *
eng_outbuf_gl_context_get(Outbuf *ob)
{
return ob->gl_context;
}
void *
eng_outbuf_egl_display_get(Outbuf *ob)
{
#ifdef GL_GLES
return ob->egl_disp;
#else
(void) ob;
return NULL;
#endif
} }