summaryrefslogtreecommitdiff
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
parent338412434cb86c847f8bbd6399bdfa311dda1fd8 (diff)
ecore_evas: killing Glew and Direct3d, because someone already killed Kenny.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c54
-rw-r--r--src/lib/ecore_evas/ecore_evas_deprecated.c20
-rw-r--r--src/modules/ecore_evas/engines/win32/ecore_evas_win32.c177
5 files changed, 31 insertions, 226 deletions
diff --git a/ChangeLog b/ChangeLog
index e5d7c72aaa..65fb3f8d9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-03-16 Cedric Bail
2
3 * Remove Glew and Direct3d code from Ecore_Evas module.
4
12013-03-15 Carsten Haitzler (The Rasterman) 52013-03-15 Carsten Haitzler (The Rasterman)
2 6
3 * Fix opengl-es 2.0 engine support to only use GL_UNPACK_ROW_LENGTH 7 * Fix opengl-es 2.0 engine support to only use GL_UNPACK_ROW_LENGTH
diff --git a/NEWS b/NEWS
index fd7325c34f..05f0f984b9 100644
--- a/NEWS
+++ b/NEWS
@@ -92,7 +92,7 @@ Deprecations:
92 92
93Removed: 93Removed:
94 * directfb support: ecore_directfb and evas directfb engine. 94 * directfb support: ecore_directfb and evas directfb engine.
95 * Removed XRender, WinCE, X11-16 and X11-8 ecore_evas support. 95 * Removed XRender, WinCE, Glew, Direct3d, X11-16 and X11-8 ecore_evas support.
96 96
97Improvements: 97Improvements:
98 * Reduced number of enqueued font commands when rendering textgrid objects 98 * Reduced number of enqueued font commands when rendering textgrid objects
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{
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 48b0602fd6..af4647e9e6 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -25,12 +25,6 @@
25#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW 25#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
26# include <Evas_Engine_Software_DDraw.h> 26# include <Evas_Engine_Software_DDraw.h>
27#endif 27#endif
28#ifdef BUILD_ECORE_EVAS_DIRECT3D
29# include <Evas_Engine_Direct3D.h>
30#endif
31#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
32# include <Evas_Engine_GL_Glew.h>
33#endif
34 28
35#ifdef BUILD_ECORE_EVAS_WIN32 29#ifdef BUILD_ECORE_EVAS_WIN32
36 30
@@ -958,24 +952,6 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
958 } 952 }
959 } 953 }
960#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ 954#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
961
962#ifdef BUILD_ECORE_EVAS_DIRECT3D
963 if (strcmp(ee->driver, "direct3d") == 0)
964 {
965 Evas_Engine_Info_Direct3D *einfo;
966
967 einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ecore_evas_get(ee));
968 if (einfo)
969 {
970 einfo->info.fullscreen = !!on;
971 einfo->info.layered = window->shape.layered;
972 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
973 {
974 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
975 }
976 }
977 }
978#endif /* BUILD_ECORE_EVAS_DIRECT3D */
979} 955}
980static void 956static void
981_ecore_evas_win32_alpha_set(Ecore_Evas *ee, int alpha) 957_ecore_evas_win32_alpha_set(Ecore_Evas *ee, int alpha)
@@ -1247,85 +1223,6 @@ _ecore_evas_engine_software_ddraw_init(Ecore_Evas *ee)
1247} 1223}
1248#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ 1224#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
1249 1225
1250#ifdef BUILD_ECORE_EVAS_DIRECT3D
1251static int
1252_ecore_evas_engine_direct3d_init(Ecore_Evas *ee)
1253{
1254 Evas_Engine_Info_Direct3D *einfo;
1255 const char *driver;
1256 int rmethod;
1257
1258 driver = "direct3d";
1259
1260 rmethod = evas_render_method_lookup(driver);
1261 if (!rmethod)
1262 return 0;
1263
1264 ee->driver = driver;
1265 evas_output_method_set(ee->evas, rmethod);
1266
1267 einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ee->evas);
1268 if (einfo)
1269 {
1270 /* FIXME: REDRAW_DEBUG missing for now */
1271 einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
1272 einfo->info.depth = ecore_win32_screen_depth_get();
1273 einfo->info.rotation = 0;
1274 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1275 {
1276 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1277 return 0;
1278 }
1279 }
1280 else
1281 {
1282 ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
1283 return 0;
1284 }
1285
1286 return 1;
1287}
1288#endif /* BUILD_ECORE_EVAS_DIRECT3D */
1289
1290#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
1291static int
1292_ecore_evas_engine_opengl_glew_init(Ecore_Evas *ee)
1293{
1294 Evas_Engine_Info_GL_Glew *einfo;
1295 const char *driver;
1296 int rmethod;
1297
1298 driver = "gl_glew";
1299
1300 rmethod = evas_render_method_lookup(driver);
1301 if (!rmethod)
1302 return 0;
1303
1304 ee->driver = driver;
1305 evas_output_method_set(ee->evas, rmethod);
1306
1307 einfo = (Evas_Engine_Info_GL_Glew *)evas_engine_info_get(ee->evas);
1308 if (einfo)
1309 {
1310 /* FIXME: REDRAW_DEBUG missing for now */
1311 einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
1312 einfo->info.depth = ecore_win32_screen_depth_get();
1313 if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
1314 {
1315 ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
1316 return 0;
1317 }
1318 }
1319 else
1320 {
1321 ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
1322 return 0;
1323 }
1324
1325 return 1;
1326}
1327#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
1328
1329static Ecore_Evas * 1226static Ecore_Evas *
1330_ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas *ee), 1227_ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas *ee),
1331 Ecore_Win32_Window *parent, 1228 Ecore_Win32_Window *parent,
@@ -1475,80 +1372,6 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent EINA_UNUSED,
1475 1372
1476#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ 1373#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
1477 1374
1478
1479EAPI Ecore_Evas *
1480ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent EINA_UNUSED,
1481 int x EINA_UNUSED,
1482 int y EINA_UNUSED,
1483 int width EINA_UNUSED,
1484 int height EINA_UNUSED)
1485{
1486 return NULL;
1487}
1488
1489#ifdef BUILD_ECORE_EVAS_DIRECT3D
1490
1491EAPI Ecore_Evas *
1492ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
1493 int x,
1494 int y,
1495 int width,
1496 int height)
1497{
1498 return _ecore_evas_win32_new_internal(_ecore_evas_engine_direct3d_init,
1499 parent,
1500 x,
1501 y,
1502 width,
1503 height);
1504}
1505
1506#else
1507
1508EAPI Ecore_Evas *
1509ecore_evas_direct3d_new(Ecore_Win32_Window *parent EINA_UNUSED,
1510 int x EINA_UNUSED,
1511 int y EINA_UNUSED,
1512 int width EINA_UNUSED,
1513 int height EINA_UNUSED)
1514{
1515 return NULL;
1516}
1517
1518#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */
1519
1520
1521#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
1522
1523EAPI Ecore_Evas *
1524ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
1525 int x,
1526 int y,
1527 int width,
1528 int height)
1529{
1530 return _ecore_evas_win32_new_internal(_ecore_evas_engine_opengl_glew_init,
1531 parent,
1532 x,
1533 y,
1534 width,
1535 height);
1536}
1537
1538#else
1539
1540EAPI Ecore_Evas *
1541ecore_evas_gl_glew_new(Ecore_Win32_Window *parent EINA_UNUSED,
1542 int x EINA_UNUSED,
1543 int y EINA_UNUSED,
1544 int width EINA_UNUSED,
1545 int height EINA_UNUSED)
1546{
1547 return NULL;
1548}
1549
1550#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
1551
1552static Ecore_Win32_Window * 1375static Ecore_Win32_Window *
1553_ecore_evas_win32_window_get(const Ecore_Evas *ee) 1376_ecore_evas_win32_window_get(const Ecore_Evas *ee)
1554{ 1377{