summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-03-16 15:50:01 +0900
committerCedric Bail <cedric.bail@free.fr>2013-03-16 15:50:01 +0900
commita4593c1cdfb7c3f463e5b192d788f5b7a7fc6f50 (patch)
tree85bc050c0dde76ab6b89ee6e2a3430f126b6e57a /src/lib/ecore_evas
parent338412434cb86c847f8bbd6399bdfa311dda1fd8 (diff)
ecore_evas: killing Glew and Direct3d, because someone already killed Kenny.
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c54
-rw-r--r--src/lib/ecore_evas/ecore_evas_deprecated.c20
2 files changed, 26 insertions, 48 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 8635c97e64..fe520d3b06 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -189,18 +189,6 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
189#else 189#else
190 return EINA_FALSE; 190 return EINA_FALSE;
191#endif 191#endif
192 case ECORE_EVAS_ENGINE_DIRECT3D:
193#ifdef BUILD_ECORE_EVAS_DIRECT3D
194 return EINA_TRUE;
195#else
196 return EINA_FALSE;
197#endif
198 case ECORE_EVAS_ENGINE_OPENGL_GLEW:
199#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
200 return EINA_TRUE;
201#else
202 return EINA_FALSE;
203#endif
204 case ECORE_EVAS_ENGINE_SOFTWARE_SDL: 192 case ECORE_EVAS_ENGINE_SOFTWARE_SDL:
205#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL 193#ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
206 return EINA_TRUE; 194 return EINA_TRUE;
@@ -230,6 +218,10 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
230 return EINA_FALSE; 218 return EINA_FALSE;
231 case ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE: 219 case ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE:
232 return EINA_FALSE; 220 return EINA_FALSE;
221 case ECORE_EVAS_ENGINE_DIRECT3D:
222 return EINA_FALSE;
223 case ECORE_EVAS_ENGINE_OPENGL_GLEW:
224 return EINA_FALSE;
233 225
234 case ECORE_EVAS_ENGINE_OPENGL_COCOA: 226 case ECORE_EVAS_ENGINE_OPENGL_COCOA:
235#ifdef BUILD_ECORE_EVAS_OPENGL_COCOA 227#ifdef BUILD_ECORE_EVAS_OPENGL_COCOA
@@ -3344,7 +3336,7 @@ ecore_evas_software_gdi_new(Ecore_Win32_Window *parent,
3344 Eina_Module *m = _ecore_evas_engine_load("win32"); 3336 Eina_Module *m = _ecore_evas_engine_load("win32");
3345 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); 3337 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3346 3338
3347 new = eina_module_symbol_get(m, "ecore_evas_software_gdi_new_internal"); 3339 new = eina_module_symbol_get(m, "ecore_evas_software_gdi_new");
3348 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL); 3340 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3349 3341
3350 return new(parent, x, y, width, height); 3342 return new(parent, x, y, width, height);
@@ -3361,41 +3353,7 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent,
3361 Eina_Module *m = _ecore_evas_engine_load("win32"); 3353 Eina_Module *m = _ecore_evas_engine_load("win32");
3362 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); 3354 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3363 3355
3364 new = eina_module_symbol_get(m, "ecore_evas_software_ddraw_new_internal"); 3356 new = eina_module_symbol_get(m, "ecore_evas_software_ddraw_new");
3365 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3366
3367 return new(parent, x, y, width, height);
3368}
3369
3370EAPI Ecore_Evas *
3371ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
3372 int x,
3373 int y,
3374 int width,
3375 int height)
3376{
3377 Ecore_Evas *(*new)(Ecore_Win32_Window *, int, int, int, int);
3378 Eina_Module *m = _ecore_evas_engine_load("win32");
3379 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3380
3381 new = eina_module_symbol_get(m, "ecore_evas_direct3d_new_internal");
3382 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3383
3384 return new(parent, x, y, width, height);
3385}
3386
3387EAPI Ecore_Evas *
3388ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
3389 int x,
3390 int y,
3391 int width,
3392 int height)
3393{
3394 Ecore_Evas *(*new)(Ecore_Win32_Window *, int, int, int, int);
3395 Eina_Module *m = _ecore_evas_engine_load("win32");
3396 EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
3397
3398 new = eina_module_symbol_get(m, "ecore_evas_gl_glew_new_internal");
3399 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL); 3357 EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
3400 3358
3401 return new(parent, x, y, width, height); 3359 return new(parent, x, y, width, height);
diff --git a/src/lib/ecore_evas/ecore_evas_deprecated.c b/src/lib/ecore_evas/ecore_evas_deprecated.c
index 1b40807e53..d347e82726 100644
--- a/src/lib/ecore_evas/ecore_evas_deprecated.c
+++ b/src/lib/ecore_evas/ecore_evas_deprecated.c
@@ -65,6 +65,26 @@ ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent EINA_UNUSED,
65 return NULL; 65 return NULL;
66} 66}
67 67
68EAPI Ecore_Evas *
69ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
70 int x,
71 int y,
72 int width,
73 int height)
74{
75 return NULL;
76}
77
78EAPI Ecore_Evas *
79ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
80 int x,
81 int y,
82 int width,
83 int height)
84{
85 return NULL;
86}
87
68EAPI Ecore_WinCE_Window * 88EAPI Ecore_WinCE_Window *
69ecore_evas_software_wince_window_get(const Ecore_Evas *ee EINA_UNUSED) 89ecore_evas_software_wince_window_get(const Ecore_Evas *ee EINA_UNUSED)
70{ 90{