Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_win32.c
Log Message:
fix the initialisation of the evas engine informations for directdraw and
direct3d
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_win32.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_evas_win32.c 21 Nov 2007 12:16:16 -0000 1.4
+++ ecore_evas_win32.c 26 Jun 2008 04:34:06 -0000 1.5
@@ -1044,25 +1044,13 @@
return NULL;
}
- printf ("ecore_evas_software_ddraw_new : ecore_win32_ddraw_init\n");
- if (!ecore_win32_ddraw_init(ee->engine.win32.window))
- {
- ecore_win32_window_del(ee->engine.win32.window);
- _ecore_evas_win32_shutdown();
- free(ee);
- return NULL;
- }
-
printf ("ecore_evas_software_ddraw_new : evas_engine_info_get\n");
einfo = (Evas_Engine_Info_Software_DDraw *)evas_engine_info_get(ee->evas);
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
einfo->info.window = ((struct _Ecore_Win32_Window
*)ee->engine.win32.window)->window;
- einfo->info.object =
ecore_win32_ddraw_object_get(ee->engine.win32.window);
- einfo->info.surface_primary =
ecore_win32_ddraw_surface_primary_get(ee->engine.win32.window);
- einfo->info.surface_back =
ecore_win32_ddraw_surface_back_get(ee->engine.win32.window);
- einfo->info.depth =
ecore_win32_ddraw_depth_get(ee->engine.win32.window);
+ einfo->info.depth = ecore_win32_screen_depth_get();;
einfo->info.rotation = 0;
printf ("ecore_evas_software_ddraw_new : evas_engine_info_set\n");
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
@@ -1159,7 +1147,7 @@
return NULL;
}
- if (!ecore_win32_ddraw_16_init(ee->engine.win32.window))
+ if (ecore_win32_screen_depth_get() != 16)
{
ecore_win32_window_del(ee->engine.win32.window);
_ecore_evas_win32_shutdown();
@@ -1167,25 +1155,17 @@
return NULL;
}
- if (ecore_win32_ddraw_depth_get(ee->engine.win32.window) != 16)
- {
- ecore_win32_ddraw_shutdown(ee->engine.win32.window);
- ecore_win32_window_del(ee->engine.win32.window);
- _ecore_evas_win32_shutdown();
- free(ee);
- return NULL;
- }
-
einfo = (Evas_Engine_Info_Software_16_DDraw
*)evas_engine_info_get(ee->evas);
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
einfo->info.window = ((struct _Ecore_Win32_Window
*)ee->engine.win32.window)->window;
- einfo->info.object =
ecore_win32_ddraw_object_get(ee->engine.win32.window);
- einfo->info.surface_primary =
ecore_win32_ddraw_surface_primary_get(ee->engine.win32.window);
- einfo->info.surface_back =
ecore_win32_ddraw_surface_back_get(ee->engine.win32.window);
- einfo->info.surface_source =
ecore_win32_ddraw_surface_source_get(ee->engine.win32.window);
- einfo->info.depth =
ecore_win32_ddraw_depth_get(ee->engine.win32.window);
+/* einfo->info.object =
ecore_win32_ddraw_object_get(ee->engine.win32.window); */
+/* einfo->info.surface_primary =
ecore_win32_ddraw_surface_primary_get(ee->engine.win32.window); */
+/* einfo->info.surface_back =
ecore_win32_ddraw_surface_back_get(ee->engine.win32.window); */
+/* einfo->info.surface_source =
ecore_win32_ddraw_surface_source_get(ee->engine.win32.window); */
+/* einfo->info.depth =
ecore_win32_ddraw_depth_get(ee->engine.win32.window); */
+ einfo->info.depth = ecore_win32_screen_depth_get();
printf ("ecore_evas_software_ddraw_16_new depth : %d\n",
einfo->info.depth);
einfo->info.rotation = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
@@ -1282,24 +1262,12 @@
return NULL;
}
- if (!ecore_win32_direct3d_init(ee->engine.win32.window))
- {
- ecore_win32_window_del(ee->engine.win32.window);
- _ecore_evas_win32_shutdown();
- free(ee);
- return NULL;
- }
-
einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ee->evas);
if (einfo)
{
/* FIXME: REDRAW_DEBUG missing for now */
einfo->info.window = ((struct _Ecore_Win32_Window
*)ee->engine.win32.window)->window;
- einfo->info.object =
ecore_win32_direct3d_object_get(ee->engine.win32.window);
- einfo->info.device =
ecore_win32_direct3d_device_get(ee->engine.win32.window);
- einfo->info.sprite =
ecore_win32_direct3d_sprite_get(ee->engine.win32.window);
- einfo->info.texture =
ecore_win32_direct3d_texture_get(ee->engine.win32.window);
- einfo->info.depth =
ecore_win32_direct3d_depth_get(ee->engine.win32.window);
+ einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
