forked from enlightenment/efl
modules: Rename EAPI macro to MODAPI for modules
Summary: Patch from a series of patches to rename EAPI symbols to specific library DSOs. = The Rationale = EAPI was designed to be able to pass `__attribute__ ((visibility ("default")))` for symbols with GCC, which would mean that even if -fvisibility=hidden was used when compiling the library, the needed symbols would get exported. MSVC __almost__ works like GCC (or mingw) in which you can declare everything as export and it will just work (slower, but it will work). But there's a caveat: global variables will not work the same way for MSVC, but works for mingw and GCC. For global variables (as opposed to functions), MSVC requires correct DSO visibility for MSVC: instead of declaring a symbol as export for everything, you need to declare it as import when importing from another DSO and export when defining it locally. With current EAPI definitions, we get the following example working in mingw and MSVC (observe it doesn't define any global variables as exported symbols). Example 1: dll1: ``` EAPI void foo(void); EAPI void bar() { foo(); } ``` dll2: ``` EAPI void foo() { printf ("foo\n"); } ``` This works fine with API defined as __declspec(dllexport) in both cases and for gcc defining as `__atttribute__((visibility("default")))`. However, the following: Example 2: dll1: ``` EAPI extern int foo; EAPI void foobar(void); EAPI void bar() { foo = 5; foobar(); } ``` dll2: ``` EAPI int foo = 0; EAPI void foobar() { printf ("foo %d\n", foo); } ``` This will work on mingw but will not work for MSVC. And that's why EAPI is the only solution that worked for MSVC. Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com> Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev> Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com> Reviewers: vtorri, jptiz, woohyun, lucas, SPAM-smith78899 Reviewed By: vtorri, SPAM-smith78899 Subscribers: SPAM-smith78899, raster, SPAM-cabanacatalogs, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12228
This commit is contained in:
parent
65d528a379
commit
a331384eed
|
@ -1,43 +1,28 @@
|
||||||
/* A small helper header defining EAPI for elementary modules, it should be
|
/* A small helper header defining ELM_API for elementary modules, it should be
|
||||||
* included last in the modules C files.
|
* included last in the modules C files.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ELM_MODULE_HELPER_H
|
#ifndef ELM_MODULE_HELPER_H
|
||||||
#define ELM_MODULE_HELPER_H
|
#define ELM_MODULE_HELPER_H
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
#ifdef EWAPI
|
|
||||||
# undef EWAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_BUILD
|
# ifndef EFL_MODULE_STATIC
|
||||||
# ifdef DLL_EXPORT
|
# define EMODAPI __declspec(dllexport)
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
# define EAPI __declspec(dllimport)
|
# define EMODAPI
|
||||||
|
# endif
|
||||||
|
# define EMODAPI_WEAK
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
# if __GNUC__ >= 4
|
||||||
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
|
# define EMODAPI_WEAK __attribute__ ((weak))
|
||||||
|
# else
|
||||||
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
# define EAPI_WEAK
|
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# define EMODAPI
|
||||||
# if __GNUC__ >= 4
|
# define EMODAPI_WEAK
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
|
||||||
# define EAPI_WEAK __attribute__ ((weak))
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# define EAPI_WEAK
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# define EAPI_WEAK
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EWAPI EAPI EAPI_WEAK
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -14,18 +14,22 @@
|
||||||
#include "ecore_evas_private.h"
|
#include "ecore_evas_private.h"
|
||||||
#include "ecore_evas_cocoa.h"
|
#include "ecore_evas_cocoa.h"
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef _WIN32
|
||||||
# undef EAPI
|
# ifndef EFL_MODULE_STATIC
|
||||||
#endif
|
# define EMODAPI __declspec(dllexport)
|
||||||
|
|
||||||
#ifdef __GNUC__
|
|
||||||
# if __GNUC__ >= 4
|
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# define EAPI
|
# ifdef __GNUC__
|
||||||
|
# if __GNUC__ >= 4
|
||||||
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int _ecore_evas_init_count = 0;
|
static int _ecore_evas_init_count = 0;
|
||||||
|
@ -651,7 +655,7 @@ _ecore_evas_cocoa_window_get(const Ecore_Evas *ee)
|
||||||
return (Ecore_Cocoa_Window *)(ee->prop.window);
|
return (Ecore_Cocoa_Window *)(ee->prop.window);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_cocoa_new_internal(Ecore_Cocoa_Window *parent EINA_UNUSED, int x, int y, int w, int h)
|
ecore_evas_cocoa_new_internal(Ecore_Cocoa_Window *parent EINA_UNUSED, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
|
|
|
@ -24,28 +24,24 @@
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
#define VSYNC_ANIMATOR 1
|
#define VSYNC_ANIMATOR 1
|
||||||
|
|
||||||
typedef struct _Ecore_Evas_Engine_Drm_Data
|
typedef struct _Ecore_Evas_Engine_Drm_Data
|
||||||
|
@ -1139,14 +1135,14 @@ eng_err:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
|
ecore_evas_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
return _ecore_evas_new_internal(device, x, y, w, h, EINA_FALSE);
|
return _ecore_evas_new_internal(device, x, y, w, h, EINA_FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_GL_DRM
|
#ifdef BUILD_ECORE_EVAS_GL_DRM
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_gl_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
|
ecore_evas_gl_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
static void *libglapi = NULL;
|
static void *libglapi = NULL;
|
||||||
|
|
|
@ -1,27 +1,23 @@
|
||||||
#include "ecore_evas_extn_engine.h"
|
#include "ecore_evas_extn_engine.h"
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
#define NBUF 2
|
#define NBUF 2
|
||||||
|
|
||||||
static int blank = 0x00000000;
|
static int blank = 0x00000000;
|
||||||
|
@ -1184,7 +1180,7 @@ _ipc_server_data(void *data, int type EINA_UNUSED, void *event)
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EMODAPI Evas_Object *
|
||||||
ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target)
|
ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target)
|
||||||
{
|
{
|
||||||
Evas_Object *o;
|
Evas_Object *o;
|
||||||
|
@ -2118,7 +2114,7 @@ static const Ecore_Evas_Engine_Func _ecore_extn_socket_engine_func =
|
||||||
NULL //fn_last_tick_get
|
NULL //fn_last_tick_get
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_extn_socket_new_internal(int w, int h)
|
ecore_evas_extn_socket_new_internal(int w, int h)
|
||||||
{
|
{
|
||||||
Evas_Engine_Info_Buffer *einfo;
|
Evas_Engine_Info_Buffer *einfo;
|
||||||
|
@ -2325,13 +2321,13 @@ _ecore_evas_extn_interface_new(void)
|
||||||
return iface;
|
return iface;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
ecore_evas_extn_socket_events_block_set_internal(Ecore_Evas *ee, Eina_Bool events_block)
|
ecore_evas_extn_socket_events_block_set_internal(Ecore_Evas *ee, Eina_Bool events_block)
|
||||||
{
|
{
|
||||||
ee->events_block = events_block;
|
ee->events_block = events_block;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
ecore_evas_extn_socket_events_block_get_internal(Ecore_Evas *ee)
|
ecore_evas_extn_socket_events_block_get_internal(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
return ee->events_block;
|
return ee->events_block;
|
||||||
|
|
|
@ -17,28 +17,24 @@
|
||||||
#include "ecore_evas_private.h"
|
#include "ecore_evas_private.h"
|
||||||
#include <Evas_Engine_FB.h>
|
#include <Evas_Engine_FB.h>
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
static int _ecore_evas_init_count = 0;
|
static int _ecore_evas_init_count = 0;
|
||||||
|
|
||||||
static char *ecore_evas_default_display = "0";
|
static char *ecore_evas_default_display = "0";
|
||||||
|
@ -564,7 +560,7 @@ static Ecore_Evas_Engine_Func _ecore_fb_engine_func =
|
||||||
NULL, //fn_last_tick_get
|
NULL, //fn_last_tick_get
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
|
ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
|
||||||
{
|
{
|
||||||
Evas_Engine_Info_FB *einfo;
|
Evas_Engine_Info_FB *einfo;
|
||||||
|
|
|
@ -20,27 +20,24 @@
|
||||||
#include <Ecore_Evas.h>
|
#include <Ecore_Evas.h>
|
||||||
#include "ecore_evas_private.h"
|
#include "ecore_evas_private.h"
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SDL only handle one window at a time. That's by definition, there is nothing wrong here.
|
* SDL only handle one window at a time. That's by definition, there is nothing wrong here.
|
||||||
*
|
*
|
||||||
|
@ -631,7 +628,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
|
ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
|
||||||
int hwsurface, int noframe, int alpha)
|
int hwsurface, int noframe, int alpha)
|
||||||
{
|
{
|
||||||
|
@ -645,7 +642,7 @@ ecore_evas_sdl_new_internal(const char* name, int w, int h, int fullscreen,
|
||||||
return ee;
|
return ee;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas*
|
EMODAPI Ecore_Evas*
|
||||||
ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED)
|
ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int fullscreen EINA_UNUSED, int hwsurface EINA_UNUSED, int noframe EINA_UNUSED, int alpha EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ERR("OUCH !");
|
ERR("OUCH !");
|
||||||
|
@ -653,7 +650,7 @@ ecore_evas_sdl16_new_internal(const char* name EINA_UNUSED, int w EINA_UNUSED, i
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
|
#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_gl_sdl_new_internal(const char* name, int w, int h, int fullscreen, int noframe)
|
ecore_evas_gl_sdl_new_internal(const char* name, int w, int h, int fullscreen, int noframe)
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
#include <Evas_Engine_Wayland.h>
|
#include <Evas_Engine_Wayland.h>
|
||||||
#include "ecore_wl2_internal.h"
|
#include "ecore_wl2_internal.h"
|
||||||
|
|
||||||
EAPI extern Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
|
EMODAPI extern Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
|
||||||
EAPI extern void _evas_canvas_image_data_regenerate(Eina_List *list);
|
EMODAPI extern void _evas_canvas_image_data_regenerate(Eina_List *list);
|
||||||
|
|
||||||
#define _smart_frame_type "ecore_evas_wl_frame"
|
#define _smart_frame_type "ecore_evas_wl_frame"
|
||||||
|
|
||||||
|
|
|
@ -5,30 +5,26 @@
|
||||||
# include <string.h>
|
# include <string.h>
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
/* external functions */
|
/* external functions */
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt)
|
ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt)
|
||||||
{
|
{
|
||||||
LOGFN;
|
LOGFN;
|
||||||
|
|
|
@ -5,30 +5,26 @@
|
||||||
# include <string.h>
|
# include <string.h>
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
/* external functions */
|
/* external functions */
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame)
|
ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame)
|
||||||
{
|
{
|
||||||
LOGFN;
|
LOGFN;
|
||||||
|
|
|
@ -28,28 +28,24 @@
|
||||||
# include <Evas_Engine_Software_DDraw.h>
|
# include <Evas_Engine_Software_DDraw.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_WIN32
|
#ifdef BUILD_ECORE_EVAS_WIN32
|
||||||
|
|
||||||
#define ECORE_EVAS_EVENT_COUNT 11
|
#define ECORE_EVAS_EVENT_COUNT 11
|
||||||
|
@ -1636,7 +1632,7 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas
|
||||||
return ee;
|
return ee;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent,
|
ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent,
|
||||||
int x,
|
int x,
|
||||||
int y,
|
int y,
|
||||||
|
@ -1660,7 +1656,7 @@ ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_software_ddraw_new_internal(Ecore_Win32_Window *parent,
|
ecore_evas_software_ddraw_new_internal(Ecore_Win32_Window *parent,
|
||||||
int x,
|
int x,
|
||||||
int y,
|
int y,
|
||||||
|
|
|
@ -27,28 +27,24 @@
|
||||||
#include "ecore_evas_private.h"
|
#include "ecore_evas_private.h"
|
||||||
#include "ecore_evas_x11.h"
|
#include "ecore_evas_x11.h"
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
#define ECORE_EVAS_X11_SELECTION 0x7F
|
#define ECORE_EVAS_X11_SELECTION 0x7F
|
||||||
|
|
||||||
#define EDBG(...) \
|
#define EDBG(...) \
|
||||||
|
@ -1943,7 +1939,7 @@ _ecore_evas_x_layer_update(Ecore_Evas *ee)
|
||||||
/* FIXME: Set gnome layer */
|
/* FIXME: Set gnome layer */
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void ecore_x_window_root_properties_select(void);
|
EMODAPI void ecore_x_window_root_properties_select(void);
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_ecore_evas_x_init(void)
|
_ecore_evas_x_init(void)
|
||||||
|
@ -4760,7 +4756,7 @@ _ecore_evas_x_flush_post(void *data, Evas *e EINA_UNUSED, void *event_info EINA_
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
|
@ -4963,7 +4959,7 @@ ecore_evas_software_x11_new_internal(const char *disp_name, Ecore_X_Window paren
|
||||||
return ee;
|
return ee;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_software_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_software_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
|
@ -5277,7 +5273,7 @@ _ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window w
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_OPENGL_X11
|
#ifdef BUILD_ECORE_EVAS_OPENGL_X11
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h, const int *opt)
|
int x, int y, int w, int h, const int *opt)
|
||||||
{
|
{
|
||||||
|
@ -5401,14 +5397,14 @@ ecore_evas_gl_x11_options_new_internal(const char *disp_name, Ecore_X_Window par
|
||||||
return ee;
|
return ee;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_gl_x11_new_internal(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_gl_x11_new_internal(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
return ecore_evas_gl_x11_options_new_internal(disp_name, parent, x, y, w, h, NULL);
|
return ecore_evas_gl_x11_options_new_internal(disp_name, parent, x, y, w, h, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EMODAPI Ecore_Evas *
|
||||||
ecore_evas_gl_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_gl_x11_pixmap_new_internal(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,28 +24,24 @@
|
||||||
static int _ecore_evas_vnc_server_log_dom;
|
static int _ecore_evas_vnc_server_log_dom;
|
||||||
static unsigned int _available_seat = 1;
|
static unsigned int _available_seat = 1;
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef DLL_EXPORT
|
# ifndef EFL_MODULE_STATIC
|
||||||
# define EAPI __declspec(dllexport)
|
# define EMODAPI __declspec(dllexport)
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif /* ! DLL_EXPORT */
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
# endif
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#ifndef EMODAPI
|
||||||
|
# define EMODAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef WRN
|
#ifdef WRN
|
||||||
#undef WRN
|
#undef WRN
|
||||||
#endif
|
#endif
|
||||||
|
@ -732,7 +728,7 @@ _ecore_evas_vnc_server_del(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||||
free(server);
|
free(server);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EMODAPI Evas_Object *
|
||||||
ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
|
ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
|
||||||
Ecore_Evas_Vnc_Client_Accept_Cb accept_cb,
|
Ecore_Evas_Vnc_Client_Accept_Cb accept_cb,
|
||||||
Ecore_Evas_Vnc_Client_Disconnected_Cb disc_cb,
|
Ecore_Evas_Vnc_Client_Disconnected_Cb disc_cb,
|
||||||
|
@ -834,7 +830,7 @@ ecore_evas_vnc_server_new(Ecore_Evas *ee, int port, const char *addr,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
ecore_evas_vnc_server_pointer_xy_get(const Evas_Object *snapshot,
|
ecore_evas_vnc_server_pointer_xy_get(const Evas_Object *snapshot,
|
||||||
const Evas_Device *pointer,
|
const Evas_Device *pointer,
|
||||||
Evas_Coord *x, Evas_Coord *y)
|
Evas_Coord *x, Evas_Coord *y)
|
||||||
|
|
|
@ -4,10 +4,6 @@
|
||||||
|
|
||||||
#include "Elementary.h"
|
#include "Elementary.h"
|
||||||
|
|
||||||
#ifndef EFL_BUILD
|
|
||||||
# define EFL_BUILD
|
|
||||||
#endif
|
|
||||||
#undef ELM_MODULE_HELPER_H
|
|
||||||
#include "elm_module_helper.h"
|
#include "elm_module_helper.h"
|
||||||
|
|
||||||
/* to enable this module
|
/* to enable this module
|
||||||
|
@ -44,7 +40,7 @@ _exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
|
||||||
}
|
}
|
||||||
|
|
||||||
// module api funcs needed
|
// module api funcs needed
|
||||||
EAPI int
|
EMODAPI int
|
||||||
elm_modapi_init(void *m EINA_UNUSED)
|
elm_modapi_init(void *m EINA_UNUSED)
|
||||||
{
|
{
|
||||||
exe_exit_handler =
|
exe_exit_handler =
|
||||||
|
@ -53,7 +49,7 @@ elm_modapi_init(void *m EINA_UNUSED)
|
||||||
return 1; // succeed always
|
return 1; // succeed always
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
elm_modapi_shutdown(void *m EINA_UNUSED)
|
elm_modapi_shutdown(void *m EINA_UNUSED)
|
||||||
{
|
{
|
||||||
if (exe_exit_handler)
|
if (exe_exit_handler)
|
||||||
|
@ -65,7 +61,7 @@ elm_modapi_shutdown(void *m EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
// module fucns for the specific module type
|
// module fucns for the specific module type
|
||||||
EAPI void
|
EMODAPI void
|
||||||
out_read(const char *txt)
|
out_read(const char *txt)
|
||||||
{
|
{
|
||||||
if (!tmpf)
|
if (!tmpf)
|
||||||
|
@ -80,7 +76,7 @@ out_read(const char *txt)
|
||||||
if (write(tmpfd, txt, strlen(txt)) < 0) perror("write to tmpfile (espeak)");
|
if (write(tmpfd, txt, strlen(txt)) < 0) perror("write to tmpfile (espeak)");
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
out_read_done(void)
|
out_read_done(void)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
|
@ -103,7 +99,7 @@ out_read_done(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
out_cancel(void)
|
out_cancel(void)
|
||||||
{
|
{
|
||||||
if (espeak)
|
if (espeak)
|
||||||
|
@ -121,7 +117,7 @@ out_cancel(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
out_done_callback_set(void (*func) (void *data), const void *data)
|
out_done_callback_set(void (*func) (void *data), const void *data)
|
||||||
{
|
{
|
||||||
cb_func = func;
|
cb_func = func;
|
||||||
|
|
|
@ -267,7 +267,7 @@ elm_prefs_page_common_unpack(Evas_Object *it,
|
||||||
elm_box_unpack(obj, it);
|
elm_box_unpack(obj, it);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
elm_modapi_init(void *m EINA_UNUSED)
|
elm_modapi_init(void *m EINA_UNUSED)
|
||||||
{
|
{
|
||||||
_elm_prefs_log_dom = eina_log_domain_register
|
_elm_prefs_log_dom = eina_log_domain_register
|
||||||
|
@ -279,7 +279,7 @@ elm_modapi_init(void *m EINA_UNUSED)
|
||||||
return 1; // succeed always
|
return 1; // succeed always
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
elm_modapi_shutdown(void *m EINA_UNUSED)
|
elm_modapi_shutdown(void *m EINA_UNUSED)
|
||||||
{
|
{
|
||||||
elm_prefs_item_iface_unregister(_elm_prefs_item_widgets);
|
elm_prefs_item_iface_unregister(_elm_prefs_item_widgets);
|
||||||
|
|
|
@ -11,32 +11,32 @@
|
||||||
#include "elm_module_helper.h"
|
#include "elm_module_helper.h"
|
||||||
|
|
||||||
// module api funcs needed
|
// module api funcs needed
|
||||||
EAPI int
|
EMODAPI int
|
||||||
elm_modapi_init(void *m EINA_UNUSED)
|
elm_modapi_init(void *m EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return 1; // succeed always
|
return 1; // succeed always
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
elm_modapi_shutdown(void *m EINA_UNUSED)
|
elm_modapi_shutdown(void *m EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return 1; // succeed always
|
return 1; // succeed always
|
||||||
}
|
}
|
||||||
|
|
||||||
// module fucns for the specific module type
|
// module fucns for the specific module type
|
||||||
EAPI void
|
EMODAPI void
|
||||||
obj_hook(Evas_Object *obj)
|
obj_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
printf("hook: %p\n", obj);
|
printf("hook: %p\n", obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
obj_unhook(Evas_Object *obj)
|
obj_unhook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
printf("unhook: %p\n", obj);
|
printf("unhook: %p\n", obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
obj_longpress(Evas_Object *obj)
|
obj_longpress(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
printf("longpress: %p\n", obj);
|
printf("longpress: %p\n", obj);
|
||||||
|
|
|
@ -12,25 +12,25 @@
|
||||||
#undef ELM_MODULE_HELPER_H
|
#undef ELM_MODULE_HELPER_H
|
||||||
#include "elm_module_helper.h"
|
#include "elm_module_helper.h"
|
||||||
|
|
||||||
EAPI Eina_Stringshare *
|
EMODAPI Eina_Stringshare *
|
||||||
map_module_source_name_get(void)
|
map_module_source_name_get(void)
|
||||||
{
|
{
|
||||||
return eina_stringshare_add("test_map");
|
return eina_stringshare_add("test_map");
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
map_module_tile_zoom_min_get(void)
|
map_module_tile_zoom_min_get(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
map_module_tile_zoom_max_get(void)
|
map_module_tile_zoom_max_get(void)
|
||||||
{
|
{
|
||||||
return 18;
|
return 18;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI char *
|
EMODAPI char *
|
||||||
map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom)
|
map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
|
@ -39,61 +39,61 @@ map_module_tile_url_get(Evas_Object *obj EINA_UNUSED, int x, int y, int zoom)
|
||||||
return strdup(buf);
|
return strdup(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI char *
|
EMODAPI char *
|
||||||
map_module_route_source_get(void)
|
map_module_route_source_get(void)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
map_module_route_source_parse(Elm_Map_Route *r EINA_UNUSED)
|
map_module_route_source_parse(Elm_Map_Route *r EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI char *
|
EMODAPI char *
|
||||||
map_module_route_url_get(Evas_Object *obj EINA_UNUSED, const char *type_name EINA_UNUSED, int method EINA_UNUSED, double flon EINA_UNUSED, double flat EINA_UNUSED, double tlon EINA_UNUSED, double tlat EINA_UNUSED)
|
map_module_route_url_get(Evas_Object *obj EINA_UNUSED, const char *type_name EINA_UNUSED, int method EINA_UNUSED, double flon EINA_UNUSED, double flat EINA_UNUSED, double tlon EINA_UNUSED, double tlat EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return strdup("");
|
return strdup("");
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI char *
|
EMODAPI char *
|
||||||
map_module_name_url_get(Evas_Object *obj EINA_UNUSED, int method EINA_UNUSED, const char *name EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED)
|
map_module_name_url_get(Evas_Object *obj EINA_UNUSED, int method EINA_UNUSED, const char *name EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return strdup("");
|
return strdup("");
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
map_module_name_source_parse(Elm_Map_Name *n EINA_UNUSED)
|
map_module_name_source_parse(Elm_Map_Name *n EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
map_module_name_list_source_parse(Elm_Map_Name_List *nl EINA_UNUSED)
|
map_module_name_list_source_parse(Elm_Map_Name_List *nl EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
map_module_tile_geo_to_coord(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int size EINA_UNUSED, int *x EINA_UNUSED, int *y EINA_UNUSED)
|
map_module_tile_geo_to_coord(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int size EINA_UNUSED, int *x EINA_UNUSED, int *y EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
map_module_tile_coord_to_geo(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int size EINA_UNUSED, double *lon EINA_UNUSED, double *lat EINA_UNUSED)
|
map_module_tile_coord_to_geo(const Evas_Object *obj EINA_UNUSED, int zoom EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int size EINA_UNUSED, double *lon EINA_UNUSED, double *lat EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI double
|
EMODAPI double
|
||||||
map_module_tile_scale_get(const Evas_Object *obj EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int zoom EINA_UNUSED)
|
map_module_tile_scale_get(const Evas_Object *obj EINA_UNUSED, double lon EINA_UNUSED, double lat EINA_UNUSED, int zoom EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EMODAPI Evas_Object *
|
||||||
map_module_tile_copyright_get(Evas_Object *obj EINA_UNUSED)
|
map_module_tile_copyright_get(Evas_Object *obj EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -309,24 +309,24 @@ _elm_web_none_elm_web_inwin_mode_get(const Eo *obj EINA_UNUSED, Elm_Web_None_Dat
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
ewm_window_features_ref(Elm_Web_Window_Features *wf EINA_UNUSED)
|
ewm_window_features_ref(Elm_Web_Window_Features *wf EINA_UNUSED)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
ewm_window_features_unref(Elm_Web_Window_Features *wf EINA_UNUSED)
|
ewm_window_features_unref(Elm_Web_Window_Features *wf EINA_UNUSED)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
ewm_window_features_property_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
|
ewm_window_features_property_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
|
||||||
Elm_Web_Window_Feature_Flag flag EINA_UNUSED)
|
Elm_Web_Window_Feature_Flag flag EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
ewm_window_features_region_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
|
ewm_window_features_region_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
|
||||||
Evas_Coord *x,
|
Evas_Coord *x,
|
||||||
Evas_Coord *y,
|
Evas_Coord *y,
|
||||||
|
@ -339,12 +339,12 @@ ewm_window_features_region_get(const Elm_Web_Window_Features *wf EINA_UNUSED,
|
||||||
if (h) *h = 0;
|
if (h) *h = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
ewm_unneed_web(void)
|
ewm_unneed_web(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
ewm_need_web(void)
|
ewm_need_web(void)
|
||||||
{
|
{
|
||||||
if (_none_log_dom == -1)
|
if (_none_log_dom == -1)
|
||||||
|
@ -352,7 +352,7 @@ ewm_need_web(void)
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI const Efl_Class *
|
EMODAPI const Efl_Class *
|
||||||
ewm_class_get(void)
|
ewm_class_get(void)
|
||||||
{
|
{
|
||||||
return elm_web_none_class_get();
|
return elm_web_none_class_get();
|
||||||
|
|
|
@ -19,6 +19,6 @@ typedef Eo Elm_Web_None;
|
||||||
*/
|
*/
|
||||||
#define ELM_WEB_NONE_CLASS elm_web_none_class_get()
|
#define ELM_WEB_NONE_CLASS elm_web_none_class_get()
|
||||||
|
|
||||||
EWAPI const Efl_Class *elm_web_none_class_get(void) EINA_CONST;
|
EMODAPI EMODAPI_WEAK const Efl_Class *elm_web_none_class_get(void) EINA_CONST;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -74,29 +74,25 @@ typedef struct _Evas_GL_Filter Evas_GL_Filter;
|
||||||
|
|
||||||
typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit);
|
typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit);
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_BUILD
|
# ifndef EFL_MODULE_STATIC
|
||||||
# ifdef DLL_EXPORT
|
# define EMODAPI __declspec(dllexport)
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
# define EAPI __declspec(dllimport)
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
|
# define EMODAPI_WEAK
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
|
# define EMODAPI_WEAK __attribute__ ((weak))
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -544,38 +540,38 @@ struct _Evas_GL_Image_Data_Map
|
||||||
};
|
};
|
||||||
|
|
||||||
/* GL_Common function that are used by gl_generic inherited module */
|
/* GL_Common function that are used by gl_generic inherited module */
|
||||||
EAPI void evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc);
|
EMODAPI void evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc);
|
||||||
EAPI void evas_gl_common_image_ref(Evas_GL_Image *im);
|
EMODAPI void evas_gl_common_image_ref(Evas_GL_Image *im);
|
||||||
EAPI void evas_gl_common_image_unref(Evas_GL_Image *im);
|
EMODAPI void evas_gl_common_image_unref(Evas_GL_Image *im);
|
||||||
EAPI Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace);
|
EMODAPI Evas_GL_Image *evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace);
|
||||||
EAPI void evas_gl_common_image_native_disable(Evas_GL_Image *im);
|
EMODAPI void evas_gl_common_image_native_disable(Evas_GL_Image *im);
|
||||||
EAPI void evas_gl_common_image_free(Evas_GL_Image *im);
|
EMODAPI void evas_gl_common_image_free(Evas_GL_Image *im);
|
||||||
EAPI void evas_gl_common_image_native_enable(Evas_GL_Image *im);
|
EMODAPI void evas_gl_common_image_native_enable(Evas_GL_Image *im);
|
||||||
|
|
||||||
EAPI int evas_gl_preload_init(void);
|
EMODAPI int evas_gl_preload_init(void);
|
||||||
EAPI int evas_gl_preload_shutdown(void);
|
EMODAPI int evas_gl_preload_shutdown(void);
|
||||||
EAPI Eina_Bool evas_gl_preload_enabled(void);
|
EMODAPI Eina_Bool evas_gl_preload_enabled(void);
|
||||||
|
|
||||||
EAPI Evas_Engine_GL_Context *evas_gl_common_context_new(void);
|
EMODAPI Evas_Engine_GL_Context *evas_gl_common_context_new(void);
|
||||||
|
|
||||||
EAPI void evas_gl_common_context_flush(Evas_Engine_GL_Context *gc);
|
EMODAPI void evas_gl_common_context_flush(Evas_Engine_GL_Context *gc);
|
||||||
EAPI void evas_gl_common_context_free(Evas_Engine_GL_Context *gc);
|
EMODAPI void evas_gl_common_context_free(Evas_Engine_GL_Context *gc);
|
||||||
EAPI void evas_gl_common_context_use(Evas_Engine_GL_Context *gc);
|
EMODAPI void evas_gl_common_context_use(Evas_Engine_GL_Context *gc);
|
||||||
EAPI void evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc);
|
EMODAPI void evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc);
|
||||||
EAPI void evas_gl_common_context_done(Evas_Engine_GL_Context *gc);
|
EMODAPI void evas_gl_common_context_done(Evas_Engine_GL_Context *gc);
|
||||||
|
|
||||||
EAPI void evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot);
|
EMODAPI void evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot);
|
||||||
EAPI int evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* fname, int frame, const char* suffix);
|
EMODAPI int evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* fname, int frame, const char* suffix);
|
||||||
|
|
||||||
EAPI void evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data);
|
EMODAPI void evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data);
|
||||||
EAPI void evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data);
|
EMODAPI void evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data);
|
||||||
EAPI void evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data);
|
EMODAPI void evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data);
|
||||||
EAPI void evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn);
|
EMODAPI void evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn);
|
||||||
EAPI Eina_Bool evas_gl_extension_string_check(const char *ext, const char *exts);
|
EMODAPI Eina_Bool evas_gl_extension_string_check(const char *ext, const char *exts);
|
||||||
|
|
||||||
EAPI void evas_gl_common_error_set(int error_enum);
|
EMODAPI void evas_gl_common_error_set(int error_enum);
|
||||||
EAPI int evas_gl_common_error_get(void);
|
EMODAPI int evas_gl_common_error_get(void);
|
||||||
EAPI void *evas_gl_common_current_context_get(void);
|
EMODAPI void *evas_gl_common_current_context_get(void);
|
||||||
|
|
||||||
typedef int (*Evas_GL_Preload)(void);
|
typedef int (*Evas_GL_Preload)(void);
|
||||||
typedef void (*Evas_GL_Common_Image_Call)(Evas_GL_Image *im);
|
typedef void (*Evas_GL_Common_Image_Call)(Evas_GL_Image *im);
|
||||||
|
@ -588,7 +584,7 @@ typedef int (*Evas_GL_Common_Buffer_Dump_Call)(Evas_Engine_GL_Context *gc,const
|
||||||
typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym), const char *extsn);
|
typedef void (*Evas_Gl_Symbols)(void *(*GetProcAddress)(const char *sym), const char *extsn);
|
||||||
typedef Eina_Bool (*Evas_Gl_Extension_String_Check)(const char *exts, const char *ext);
|
typedef Eina_Bool (*Evas_Gl_Extension_String_Check)(const char *exts, const char *ext);
|
||||||
|
|
||||||
EAPI void __evas_gl_err(int err, const char *file, const char *func, int line, const char *op);
|
EMODAPI void __evas_gl_err(int err, const char *file, const char *func, int line, const char *op);
|
||||||
|
|
||||||
int evas_gl_common_version_check(int *minor_version);
|
int evas_gl_common_version_check(int *minor_version);
|
||||||
void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc,
|
void evas_gl_common_tiling_start(Evas_Engine_GL_Context *gc,
|
||||||
|
@ -692,7 +688,7 @@ void evas_gl_common_filter_inverse_color_push(Evas_Engine_GL_Contex
|
||||||
|
|
||||||
int evas_gl_common_shader_program_init(Evas_GL_Shared *shared);
|
int evas_gl_common_shader_program_init(Evas_GL_Shared *shared);
|
||||||
void evas_gl_common_shader_program_shutdown(Evas_GL_Shared *shared);
|
void evas_gl_common_shader_program_shutdown(Evas_GL_Shared *shared);
|
||||||
EAPI void evas_gl_common_shaders_flush(Evas_GL_Shared *shared);
|
EMODAPI void evas_gl_common_shaders_flush(Evas_GL_Shared *shared);
|
||||||
|
|
||||||
Evas_GL_Program *evas_gl_common_shader_program_get(Evas_Engine_GL_Context *gc,
|
Evas_GL_Program *evas_gl_common_shader_program_get(Evas_Engine_GL_Context *gc,
|
||||||
Shader_Type type,
|
Shader_Type type,
|
||||||
|
@ -788,8 +784,8 @@ extern GLboolean (*glsym_glUnmapBuffer) (GLenum a);
|
||||||
extern void (*glsym_glRenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
|
extern void (*glsym_glRenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
|
||||||
|
|
||||||
#ifdef GL_GLES
|
#ifdef GL_GLES
|
||||||
EAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
|
EMODAPI void * evas_gl_common_eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
|
||||||
EAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im);
|
EMODAPI int evas_gl_common_eglDestroyImage (EGLDisplay dpy, void *im);
|
||||||
extern unsigned int (*eglsym_eglDestroyImage) (void *a, void *b);
|
extern unsigned int (*eglsym_eglDestroyImage) (void *a, void *b);
|
||||||
extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b);
|
extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b);
|
||||||
extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d);
|
extern void *(*secsym_eglMapImageSEC) (void *a, void *b, int c, int d);
|
||||||
|
@ -984,9 +980,6 @@ _comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef EAPI
|
|
||||||
#define EAPI
|
|
||||||
|
|
||||||
extern Eina_Bool _need_context_restore;
|
extern Eina_Bool _need_context_restore;
|
||||||
extern void _context_restore(void);
|
extern void _context_restore(void);
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ sym_missing(void)
|
||||||
* Previously we used strstr(), however there are some extensions
|
* Previously we used strstr(), however there are some extensions
|
||||||
* whose names are subsets of others.
|
* whose names are subsets of others.
|
||||||
*/
|
*/
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
evas_gl_extension_string_check(const char *exts, const char *ext)
|
evas_gl_extension_string_check(const char *exts, const char *ext)
|
||||||
{
|
{
|
||||||
const char *ptr;
|
const char *ptr;
|
||||||
|
@ -155,7 +155,7 @@ _has_ext(const char *ext, const char **pexts, int *pnum)
|
||||||
|
|
||||||
#ifdef GL_GLES
|
#ifdef GL_GLES
|
||||||
|
|
||||||
EAPI void *
|
EMODAPI void *
|
||||||
evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list)
|
evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list)
|
||||||
{
|
{
|
||||||
if (eglsym_eglCreateImageKHR)
|
if (eglsym_eglCreateImageKHR)
|
||||||
|
@ -178,7 +178,7 @@ evas_gl_common_eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EG
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
|
evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
|
||||||
{
|
{
|
||||||
if (eglsym_eglDestroyImage)
|
if (eglsym_eglDestroyImage)
|
||||||
|
@ -189,7 +189,7 @@ evas_gl_common_eglDestroyImage(EGLDisplay dpy, void *im)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* FIXME: return error if a required symbol was not found */
|
/* FIXME: return error if a required symbol was not found */
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
|
evas_gl_symbols(void *(*GetProcAddress)(const char *name), const char *extsn)
|
||||||
{
|
{
|
||||||
int failed = 0, num = 0;
|
int failed = 0, num = 0;
|
||||||
|
@ -442,7 +442,7 @@ static void shader_array_flush(Evas_Engine_GL_Context *gc);
|
||||||
static Evas_Engine_GL_Context *_evas_gl_common_context = NULL;
|
static Evas_Engine_GL_Context *_evas_gl_common_context = NULL;
|
||||||
static Evas_GL_Shared *shared = NULL;
|
static Evas_GL_Shared *shared = NULL;
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
__evas_gl_err(int err, const char *file, const char *func, int line, const char *op)
|
__evas_gl_err(int err, const char *file, const char *func, int line, const char *op)
|
||||||
{
|
{
|
||||||
const char *errmsg;
|
const char *errmsg;
|
||||||
|
@ -863,7 +863,7 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Engine_GL_Context *
|
EMODAPI Evas_Engine_GL_Context *
|
||||||
evas_gl_common_context_new(void)
|
evas_gl_common_context_new(void)
|
||||||
{
|
{
|
||||||
Evas_Engine_GL_Context *gc;
|
Evas_Engine_GL_Context *gc;
|
||||||
|
@ -1419,7 +1419,7 @@ array_alloc(Evas_Engine_GL_Context *gc, int n)
|
||||||
#undef RALOC
|
#undef RALOC
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
|
evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
|
@ -1507,7 +1507,7 @@ evas_gl_common_context_free(Evas_Engine_GL_Context *gc)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
|
evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
|
||||||
{
|
{
|
||||||
if (_evas_gl_common_context == gc) return;
|
if (_evas_gl_common_context == gc) return;
|
||||||
|
@ -1515,7 +1515,7 @@ evas_gl_common_context_use(Evas_Engine_GL_Context *gc)
|
||||||
if (gc) _evas_gl_common_viewport_set(gc);
|
if (gc) _evas_gl_common_viewport_set(gc);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
|
evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -1608,7 +1608,7 @@ evas_gl_common_context_newframe(Evas_Engine_GL_Context *gc)
|
||||||
_evas_gl_common_viewport_set(gc);
|
_evas_gl_common_viewport_set(gc);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot)
|
evas_gl_common_context_resize(Evas_Engine_GL_Context *gc, int w, int h, int rot)
|
||||||
{
|
{
|
||||||
if ((gc->w == w) && (gc->h == h) && (gc->rot == rot)) return;
|
if ((gc->w == w) && (gc->h == h) && (gc->rot == rot)) return;
|
||||||
|
@ -1659,7 +1659,7 @@ evas_gl_common_tiling_done(Evas_Engine_GL_Context *gc EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_done(Evas_Engine_GL_Context *gc)
|
evas_gl_common_context_done(Evas_Engine_GL_Context *gc)
|
||||||
{
|
{
|
||||||
if (gc->master_clip.used)
|
if (gc->master_clip.used)
|
||||||
|
@ -3909,7 +3909,7 @@ evas_gl_common_filter_inverse_color_push(Evas_Engine_GL_Context *gc,
|
||||||
}
|
}
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_flush(Evas_Engine_GL_Context *gc)
|
evas_gl_common_context_flush(Evas_Engine_GL_Context *gc)
|
||||||
{
|
{
|
||||||
shader_array_flush(gc);
|
shader_array_flush(gc);
|
||||||
|
@ -4712,7 +4712,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
|
||||||
gc->havestuff = EINA_FALSE;
|
gc->havestuff = EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* buf_name, int frame, const char *suffix)
|
evas_gl_common_buffer_dump(Evas_Engine_GL_Context *gc, const char* dname, const char* buf_name, int frame, const char *suffix)
|
||||||
{
|
{
|
||||||
RGBA_Image *im = NULL;
|
RGBA_Image *im = NULL;
|
||||||
|
|
|
@ -1721,7 +1721,7 @@ _evgl_tls_resource_destroy(void *eng_data)
|
||||||
evgl_engine->resource_key = 0;
|
evgl_engine->resource_key = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void * /* EVGL_Context */
|
EMODAPI void * /* EVGL_Context */
|
||||||
evas_gl_common_current_context_get(void)
|
evas_gl_common_current_context_get(void)
|
||||||
{
|
{
|
||||||
EVGL_Resource *rsc;
|
EVGL_Resource *rsc;
|
||||||
|
@ -1735,7 +1735,7 @@ evas_gl_common_current_context_get(void)
|
||||||
return rsc->current_ctx;
|
return rsc->current_ctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void *
|
EMODAPI void *
|
||||||
evgl_current_native_context_get(EVGL_Context *ctx)
|
evgl_current_native_context_get(EVGL_Context *ctx)
|
||||||
{
|
{
|
||||||
EVGLNative_Context context;
|
EVGLNative_Context context;
|
||||||
|
@ -1787,7 +1787,7 @@ _evgl_direct_enabled(void)
|
||||||
return _evgl_direct_renderable(rsc, sfc);
|
return _evgl_direct_renderable(rsc, sfc);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_error_set(int error_enum)
|
evas_gl_common_error_set(int error_enum)
|
||||||
{
|
{
|
||||||
EVGL_Resource *rsc;
|
EVGL_Resource *rsc;
|
||||||
|
@ -1801,7 +1801,7 @@ evas_gl_common_error_set(int error_enum)
|
||||||
rsc->error_state = error_enum;
|
rsc->error_state = error_enum;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
evas_gl_common_error_get(void)
|
evas_gl_common_error_get(void)
|
||||||
{
|
{
|
||||||
EVGL_Resource *rsc;
|
EVGL_Resource *rsc;
|
||||||
|
@ -3266,7 +3266,7 @@ evgl_direct_partial_render_end()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_context_restore_set(Eina_Bool enable)
|
evas_gl_common_context_restore_set(Eina_Bool enable)
|
||||||
{
|
{
|
||||||
_need_context_restore = enable;
|
_need_context_restore = enable;
|
||||||
|
|
|
@ -3,29 +3,25 @@
|
||||||
#define EVAS_GL_NO_GL_H_CHECK 1
|
#define EVAS_GL_NO_GL_H_CHECK 1
|
||||||
#include "Evas_GL.h"
|
#include "Evas_GL.h"
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef EMODAPI
|
||||||
# undef EAPI
|
# undef EMODAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_BUILD
|
# ifndef EFL_MODULE_STATIC
|
||||||
# ifdef DLL_EXPORT
|
# define EMODAPI __declspec(dllexport)
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
# define EAPI __declspec(dllimport)
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -43,11 +39,11 @@ typedef struct _EVGL_Cap EVGL_Cap;
|
||||||
typedef struct _EVGL_Surface_Cap EVGL_Surface_Cap;
|
typedef struct _EVGL_Surface_Cap EVGL_Surface_Cap;
|
||||||
typedef struct _EVGL_Surface_Format EVGL_Surface_Format;
|
typedef struct _EVGL_Surface_Format EVGL_Surface_Format;
|
||||||
|
|
||||||
EAPI void evgl_engine_shutdown(void *eng_data);
|
EMODAPI void evgl_engine_shutdown(void *eng_data);
|
||||||
EAPI void *evgl_native_surface_buffer_get(EVGL_Surface *sfc, Eina_Bool *is_egl_image);
|
EMODAPI void *evgl_native_surface_buffer_get(EVGL_Surface *sfc, Eina_Bool *is_egl_image);
|
||||||
EAPI int evgl_native_surface_yinvert_get(EVGL_Surface *sfc);
|
EMODAPI int evgl_native_surface_yinvert_get(EVGL_Surface *sfc);
|
||||||
EAPI void *evgl_current_native_context_get(EVGL_Context *ctx);
|
EMODAPI void *evgl_current_native_context_get(EVGL_Context *ctx);
|
||||||
EAPI void evas_gl_common_context_restore_set(Eina_Bool);
|
EMODAPI void evas_gl_common_context_restore_set(Eina_Bool);
|
||||||
|
|
||||||
typedef void (*EVGL_Engine_Call)(void *eng_data);
|
typedef void (*EVGL_Engine_Call)(void *eng_data);
|
||||||
typedef void *(*EVGL_Native_Surface_Call)(void *sfc, Eina_Bool *is_egl_image);
|
typedef void *(*EVGL_Native_Surface_Call)(void *sfc, Eina_Bool *is_egl_image);
|
||||||
|
@ -89,7 +85,4 @@ void evgl_direct_partial_info_clear(void);
|
||||||
void evgl_direct_partial_render_start(void);
|
void evgl_direct_partial_render_start(void);
|
||||||
void evgl_direct_partial_render_end(void);
|
void evgl_direct_partial_render_end(void);
|
||||||
|
|
||||||
#undef EAPI
|
|
||||||
#define EAPI
|
|
||||||
|
|
||||||
#endif //_EVAS_GL_CORE_H
|
#endif //_EVAS_GL_CORE_H
|
||||||
|
|
|
@ -8,7 +8,7 @@ evas_gl_common_image_alloc_ensure(Evas_GL_Image *im)
|
||||||
im->w, im->h);
|
im->w, im->h);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc)
|
evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
@ -89,7 +89,7 @@ _evas_gl_image_cache_add(Evas_GL_Image *im)
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_image_ref(Evas_GL_Image *im)
|
evas_gl_common_image_ref(Evas_GL_Image *im)
|
||||||
{
|
{
|
||||||
if (im->references == 0)
|
if (im->references == 0)
|
||||||
|
@ -99,7 +99,7 @@ evas_gl_common_image_ref(Evas_GL_Image *im)
|
||||||
im->references++;
|
im->references++;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_image_unref(Evas_GL_Image *im)
|
evas_gl_common_image_unref(Evas_GL_Image *im)
|
||||||
{
|
{
|
||||||
im->references--;
|
im->references--;
|
||||||
|
@ -330,7 +330,7 @@ evas_gl_common_image_mmap(Evas_Engine_GL_Context *gc, Eina_File *f, const char *
|
||||||
return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error);
|
return evas_gl_common_image_new_from_rgbaimage(gc, im_im, lo, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_GL_Image *
|
EMODAPI Evas_GL_Image *
|
||||||
evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace)
|
evas_gl_common_image_new_from_data(Evas_Engine_GL_Context *gc, unsigned int w, unsigned int h, DATA32 *data, int alpha, Evas_Colorspace cspace)
|
||||||
{
|
{
|
||||||
Evas_GL_Image *im;
|
Evas_GL_Image *im;
|
||||||
|
@ -539,7 +539,7 @@ evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha)
|
||||||
return im;
|
return im;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_image_native_enable(Evas_GL_Image *im)
|
evas_gl_common_image_native_enable(Evas_GL_Image *im)
|
||||||
{
|
{
|
||||||
if (im->cs.data)
|
if (im->cs.data)
|
||||||
|
@ -571,7 +571,7 @@ evas_gl_common_image_native_enable(Evas_GL_Image *im)
|
||||||
im->tex_only = 1;
|
im->tex_only = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_image_native_disable(Evas_GL_Image *im)
|
evas_gl_common_image_native_disable(Evas_GL_Image *im)
|
||||||
{
|
{
|
||||||
if (im->im)
|
if (im->im)
|
||||||
|
@ -691,7 +691,7 @@ evas_gl_common_image_cache_flush(Evas_Engine_GL_Context *gc)
|
||||||
_evas_gl_image_cache_trim(gc);
|
_evas_gl_image_cache_trim(gc);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_image_free(Evas_GL_Image *im)
|
evas_gl_common_image_free(Evas_GL_Image *im)
|
||||||
{
|
{
|
||||||
if (!im) return;
|
if (!im) return;
|
||||||
|
|
|
@ -231,7 +231,7 @@ _evas_gl_preload_tile_async(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
|
||||||
|
|
||||||
|
|
||||||
// Put the async preloader on standby
|
// Put the async preloader on standby
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data)
|
evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_data)
|
||||||
{
|
{
|
||||||
if (!async_loader_init) return ;
|
if (!async_loader_init) return ;
|
||||||
|
@ -251,7 +251,7 @@ evas_gl_preload_render_lock(evas_gl_make_current_cb make_current, void *engine_d
|
||||||
}
|
}
|
||||||
|
|
||||||
// Let the async preloader run !
|
// Let the async preloader run !
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data)
|
evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine_data)
|
||||||
{
|
{
|
||||||
if (!async_loader_init) return ;
|
if (!async_loader_init) return ;
|
||||||
|
@ -272,7 +272,7 @@ evas_gl_preload_render_unlock(evas_gl_make_current_cb make_current, void *engine
|
||||||
}
|
}
|
||||||
|
|
||||||
// add a way to destroy surface and temporarily stop the rendering of the image
|
// add a way to destroy surface and temporarily stop the rendering of the image
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data)
|
evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_data)
|
||||||
{
|
{
|
||||||
if (engine_data != async_engine_data) return ;
|
if (engine_data != async_engine_data) return ;
|
||||||
|
@ -324,7 +324,7 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo *target)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
evas_gl_preload_init(void)
|
evas_gl_preload_init(void)
|
||||||
{
|
{
|
||||||
const char *s = getenv("EVAS_GL_PRELOAD");
|
const char *s = getenv("EVAS_GL_PRELOAD");
|
||||||
|
@ -342,7 +342,7 @@ evas_gl_preload_init(void)
|
||||||
return async_loader_init;
|
return async_loader_init;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
evas_gl_preload_shutdown(void)
|
evas_gl_preload_shutdown(void)
|
||||||
{
|
{
|
||||||
const char *s = getenv("EVAS_GL_PRELOAD");
|
const char *s = getenv("EVAS_GL_PRELOAD");
|
||||||
|
@ -360,7 +360,7 @@ evas_gl_preload_shutdown(void)
|
||||||
return async_loader_init;
|
return async_loader_init;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Eina_Bool
|
EMODAPI Eina_Bool
|
||||||
evas_gl_preload_enabled(void)
|
evas_gl_preload_enabled(void)
|
||||||
{
|
{
|
||||||
return (async_loader_init >= 1);
|
return (async_loader_init >= 1);
|
||||||
|
|
|
@ -714,7 +714,7 @@ evas_gl_common_shader_program_init(Evas_GL_Shared *shared)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
evas_gl_common_shaders_flush(Evas_GL_Shared *shared)
|
evas_gl_common_shaders_flush(Evas_GL_Shared *shared)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -1,27 +1,17 @@
|
||||||
#ifndef EVAS_ECTOR_GL_H
|
#ifndef EVAS_ECTOR_GL_H
|
||||||
#define EVAS_ECTOR_GL_H
|
#define EVAS_ECTOR_GL_H
|
||||||
|
|
||||||
#undef EAPI
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_BUILD
|
# define EMODAPI __declspec(dllexport)
|
||||||
# ifdef DLL_EXPORT
|
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# define EAPI __declspec(dllimport)
|
|
||||||
# endif
|
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -29,8 +19,5 @@
|
||||||
#include "evas_ector_gl_buffer.eo.h"
|
#include "evas_ector_gl_buffer.eo.h"
|
||||||
#include "evas_ector_gl_image_buffer.eo.h"
|
#include "evas_ector_gl_image_buffer.eo.h"
|
||||||
|
|
||||||
#undef EAPI
|
|
||||||
#define EAPI
|
|
||||||
|
|
||||||
#endif /* ! EVAS_ECTOR_GL_H */
|
#endif /* ! EVAS_ECTOR_GL_H */
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,7 @@ foreach eo_file : pub_eo_files
|
||||||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||||
|
'-e', 'EMODAPI',
|
||||||
'-gchd', '@INPUT@'])
|
'-gchd', '@INPUT@'])
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
|
|
@ -1,37 +1,29 @@
|
||||||
#ifndef EVAS_ECTOR_SOFTWARE_H
|
#ifndef EVAS_ECTOR_SOFTWARE_H
|
||||||
#define EVAS_ECTOR_SOFTWARE_H
|
#define EVAS_ECTOR_SOFTWARE_H
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_BUILD
|
# ifndef EFL_MODULE_STATIC
|
||||||
# ifdef DLL_EXPORT
|
# define EMODAPI __declspec(dllexport)
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
# define EAPI __declspec(dllimport)
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
|
# define EMODAPI_WEAK __attribute__ ((weak))
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "evas_ector_buffer.eo.h"
|
#include "evas_ector_buffer.eo.h"
|
||||||
#include "evas_ector_software_buffer.eo.h"
|
#include "evas_ector_software_buffer.eo.h"
|
||||||
|
|
||||||
#undef EAPI
|
|
||||||
#define EAPI
|
|
||||||
|
|
||||||
#endif /* ! EVAS_ECTOR_SOFTWARE_H */
|
#endif /* ! EVAS_ECTOR_SOFTWARE_H */
|
||||||
|
|
||||||
|
|
|
@ -1,29 +1,24 @@
|
||||||
#ifndef _EVAS_NATIVE_COMMON_H
|
#ifndef _EVAS_NATIVE_COMMON_H
|
||||||
#define _EVAS_NATIVE_COMMON_H
|
#define _EVAS_NATIVE_COMMON_H
|
||||||
|
|
||||||
#ifdef EAPI
|
|
||||||
# undef EAPI
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_BUILD
|
# ifndef EFL_MODULE_STATIC
|
||||||
# ifdef DLL_EXPORT
|
# define EMODAPI __declspec(dllexport)
|
||||||
# define EAPI __declspec(dllexport)
|
|
||||||
# else
|
|
||||||
# define EAPI
|
|
||||||
# endif
|
|
||||||
# else
|
# else
|
||||||
# define EAPI __declspec(dllimport)
|
# define EMODAPI
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
# ifdef __GNUC__
|
# ifdef __GNUC__
|
||||||
# if __GNUC__ >= 4
|
# if __GNUC__ >= 4
|
||||||
# define EAPI __attribute__ ((visibility("default")))
|
# define EMODAPI __attribute__ ((visibility("default")))
|
||||||
|
# define EMODAPI_WEAK __attribute__ ((weak))
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# define EAPI
|
# define EMODAPI
|
||||||
|
# define EMODAPI_WEAK
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -109,10 +104,10 @@ struct _Native
|
||||||
} ns_data; /**< Choose one union data according to your surface in Evas Engine. */
|
} ns_data; /**< Choose one union data according to your surface in Evas Engine. */
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI void *_evas_native_tbm_surface_image_set(void *data, void *image, void *native);
|
EMODAPI void *_evas_native_tbm_surface_image_set(void *data, void *image, void *native);
|
||||||
EAPI int _evas_native_tbm_surface_stride_get(void *data, void *native);
|
EMODAPI int _evas_native_tbm_surface_stride_get(void *data, void *native);
|
||||||
EAPI int _evas_native_tbm_init(void);
|
EMODAPI int _evas_native_tbm_init(void);
|
||||||
EAPI void _evas_native_tbm_shutdown(void);
|
EMODAPI void _evas_native_tbm_shutdown(void);
|
||||||
|
|
||||||
void *_evas_native_dmabuf_surface_image_set(void *image, void *native);
|
void *_evas_native_dmabuf_surface_image_set(void *image, void *native);
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ static int (*sym_tbm_surface_map) (tbm_surface_h surface, int opt, tbm_surface_i
|
||||||
static int (*sym_tbm_surface_unmap) (tbm_surface_h surface) = NULL;
|
static int (*sym_tbm_surface_unmap) (tbm_surface_h surface) = NULL;
|
||||||
static int (*sym_tbm_surface_get_info) (tbm_surface_h surface, tbm_surface_info_s *info) = NULL;
|
static int (*sym_tbm_surface_get_info) (tbm_surface_h surface, tbm_surface_info_s *info) = NULL;
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
_evas_native_tbm_init(void)
|
_evas_native_tbm_init(void)
|
||||||
{
|
{
|
||||||
if (tbm_lib)
|
if (tbm_lib)
|
||||||
|
@ -118,7 +118,7 @@ _evas_native_tbm_init(void)
|
||||||
return tbm_ref;
|
return tbm_ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EMODAPI void
|
||||||
_evas_native_tbm_shutdown(void)
|
_evas_native_tbm_shutdown(void)
|
||||||
{
|
{
|
||||||
if (tbm_ref > 0)
|
if (tbm_ref > 0)
|
||||||
|
@ -262,7 +262,7 @@ _native_free_cb(void *image)
|
||||||
_evas_native_tbm_shutdown();
|
_evas_native_tbm_shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI int
|
EMODAPI int
|
||||||
_evas_native_tbm_surface_stride_get(void *data EINA_UNUSED, void *native)
|
_evas_native_tbm_surface_stride_get(void *data EINA_UNUSED, void *native)
|
||||||
{
|
{
|
||||||
Evas_Native_Surface *ns = native;
|
Evas_Native_Surface *ns = native;
|
||||||
|
@ -285,7 +285,7 @@ _evas_native_tbm_surface_stride_get(void *data EINA_UNUSED, void *native)
|
||||||
return stride;
|
return stride;
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void *
|
EMODAPI void *
|
||||||
_evas_native_tbm_surface_image_set(void *data EINA_UNUSED, void *image, void *native)
|
_evas_native_tbm_surface_image_set(void *data EINA_UNUSED, void *image, void *native)
|
||||||
{
|
{
|
||||||
Evas_Native_Surface *ns = native;
|
Evas_Native_Surface *ns = native;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include "config.h" /* so that EAPI in Eet.h is correctly defined */
|
# include "config.h" /* so that EMODAPI in Eet.h is correctly defined */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Eet.h>
|
#include <Eet.h>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include "config.h" /* so that EAPI in Eet.h is correctly defined */
|
# include "config.h" /* so that EMODAPI in Eet.h is correctly defined */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Eet.h>
|
#include <Eet.h>
|
||||||
|
|
Loading…
Reference in New Issue