ecore_evas: killing Glew and Direct3d, because someone already killed Kenny.

diff --git a/ChangeLog b/ChangeLog
index e5d7c72..65fb3f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-16  Cedric Bail
+
+       * Remove Glew and Direct3d code from Ecore_Evas module.
+
 2013-03-15  Carsten Haitzler (The Rasterman)
 
         * Fix opengl-es 2.0 engine support to only use GL_UNPACK_ROW_LENGTH

diff --git a/NEWS b/NEWS
index fd7325c..05f0f98 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -92,7 +92,7 @@ Deprecations:
 
 Removed:
     * directfb support: ecore_directfb and evas directfb engine.
-    * Removed XRender, WinCE, X11-16 and X11-8 ecore_evas support.
+    * Removed XRender, WinCE, Glew, Direct3d, X11-16 and X11-8 ecore_evas support.
 
 Improvements:
     * 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 8635c97..fe520d3 100644 (file)
--- 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)
 #else
         return EINA_FALSE;
 #endif
-      case ECORE_EVAS_ENGINE_DIRECT3D:
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
-        return EINA_TRUE;
-#else
-        return EINA_FALSE;
-#endif
-      case ECORE_EVAS_ENGINE_OPENGL_GLEW:
-#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
-        return EINA_TRUE;
-#else
-        return EINA_FALSE;
-#endif
      case ECORE_EVAS_ENGINE_SOFTWARE_SDL:
 #ifdef BUILD_ECORE_EVAS_SOFTWARE_SDL
         return EINA_TRUE;
@@ -230,6 +218,10 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
         return EINA_FALSE;
       case ECORE_EVAS_ENGINE_SOFTWARE_16_WINCE:
         return EINA_FALSE;
+      case ECORE_EVAS_ENGINE_DIRECT3D:
+        return EINA_FALSE;
+      case ECORE_EVAS_ENGINE_OPENGL_GLEW:
+        return EINA_FALSE;
 
       case ECORE_EVAS_ENGINE_OPENGL_COCOA:
 #ifdef BUILD_ECORE_EVAS_OPENGL_COCOA
@@ -3344,7 +3336,7 @@ ecore_evas_software_gdi_new(Ecore_Win32_Window *parent,
    Eina_Module *m = _ecore_evas_engine_load("win32");
    EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
 
-   new = eina_module_symbol_get(m, "ecore_evas_software_gdi_new_internal");
+   new = eina_module_symbol_get(m, "ecore_evas_software_gdi_new");
    EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
 
    return new(parent, x, y, width, height);
@@ -3361,41 +3353,7 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent,
    Eina_Module *m = _ecore_evas_engine_load("win32");
    EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
 
-   new = eina_module_symbol_get(m, "ecore_evas_software_ddraw_new_internal");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
-
-   return new(parent, x, y, width, height);
-}
-
-EAPI Ecore_Evas *
-ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
-                       int                 x,
-                       int                 y,
-                       int                 width,
-                       int                 height)
-{
-   Ecore_Evas *(*new)(Ecore_Win32_Window *, int, int, int, int);
-   Eina_Module *m = _ecore_evas_engine_load("win32");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
-
-   new = eina_module_symbol_get(m, "ecore_evas_direct3d_new_internal");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
-
-   return new(parent, x, y, width, height);
-}
-
-EAPI Ecore_Evas *
-ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
-                      int                 x,
-                      int                 y,
-                      int                 width,
-                      int                 height)
-{
-   Ecore_Evas *(*new)(Ecore_Win32_Window *, int, int, int, int);
-   Eina_Module *m = _ecore_evas_engine_load("win32");
-   EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
-
-   new = eina_module_symbol_get(m, "ecore_evas_gl_glew_new_internal");
+   new = eina_module_symbol_get(m, "ecore_evas_software_ddraw_new");
    EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
 
    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 1b40807..d347e82 100644 (file)
--- 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,
    return NULL;
 }
 
+EAPI Ecore_Evas *
+ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
+                       int                 x,
+                       int                 y,
+                       int                 width,
+                       int                 height)
+{
+   return NULL;
+}
+
+EAPI Ecore_Evas *
+ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
+                      int                 x,
+                      int                 y,
+                      int                 width,
+                      int                 height)
+{
+   return NULL;
+}
+
 EAPI Ecore_WinCE_Window *
 ecore_evas_software_wince_window_get(const Ecore_Evas *ee EINA_UNUSED)
 {

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 48b0602..af4647e 100644 (file)
--- 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 @@
 #ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
 # include <Evas_Engine_Software_DDraw.h>
 #endif
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
-# include <Evas_Engine_Direct3D.h>
-#endif
-#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
-# include <Evas_Engine_GL_Glew.h>
-#endif
 
 #ifdef BUILD_ECORE_EVAS_WIN32
 
@@ -958,24 +952,6 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
           }
      }
 #endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
-
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
-   if (strcmp(ee->driver, "direct3d") == 0)
-     {
-        Evas_Engine_Info_Direct3D *einfo;
-
-        einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(ecore_evas_get(ee));
-        if (einfo)
-          {
-             einfo->info.fullscreen = !!on;
-             einfo->info.layered = window->shape.layered;
-             if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
-               {
-                  ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
-               }
-          }
-     }
-#endif /* BUILD_ECORE_EVAS_DIRECT3D */
 }
 static void
 _ecore_evas_win32_alpha_set(Ecore_Evas *ee, int alpha)
@@ -1247,85 +1223,6 @@ _ecore_evas_engine_software_ddraw_init(Ecore_Evas *ee)
 }
 #endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
 
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
-static int
-_ecore_evas_engine_direct3d_init(Ecore_Evas *ee)
-{
-   Evas_Engine_Info_Direct3D *einfo;
-   const char                *driver;
-   int                        rmethod;
-
-   driver = "direct3d";
-
-   rmethod = evas_render_method_lookup(driver);
-   if (!rmethod)
-     return 0;
-
-   ee->driver = driver;
-   evas_output_method_set(ee->evas, rmethod);
-
-   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->prop.window)->window;
-        einfo->info.depth = ecore_win32_screen_depth_get();
-        einfo->info.rotation = 0;
-        if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
-          {
-             ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
-             return 0;
-          }
-     }
-   else
-     {
-        ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
-        return 0;
-     }
-
-   return 1;
-}
-#endif /* BUILD_ECORE_EVAS_DIRECT3D */
-
-#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
-static int
-_ecore_evas_engine_opengl_glew_init(Ecore_Evas *ee)
-{
-   Evas_Engine_Info_GL_Glew *einfo;
-   const char               *driver;
-   int                       rmethod;
-
-   driver = "gl_glew";
-
-   rmethod = evas_render_method_lookup(driver);
-   if (!rmethod)
-     return 0;
-
-   ee->driver = driver;
-   evas_output_method_set(ee->evas, rmethod);
-
-   einfo = (Evas_Engine_Info_GL_Glew *)evas_engine_info_get(ee->evas);
-   if (einfo)
-     {
-        /* FIXME: REDRAW_DEBUG missing for now */
-        einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
-        einfo->info.depth = ecore_win32_screen_depth_get();
-        if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
-          {
-             ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
-             return 0;
-          }
-     }
-   else
-     {
-        ERR("evas_engine_info_set() init engine '%s' failed.", ee->driver);
-        return 0;
-     }
-
-   return 1;
-}
-#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
-
 static Ecore_Evas *
 _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas *ee),
                                Ecore_Win32_Window *parent,
@@ -1475,80 +1372,6 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent EINA_UNUSED,
 
 #endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
 
-
-EAPI Ecore_Evas *
-ecore_evas_software_16_ddraw_new(Ecore_Win32_Window *parent EINA_UNUSED,
-                                 int                 x EINA_UNUSED,
-                                 int                 y EINA_UNUSED,
-                                 int                 width EINA_UNUSED,
-                                 int                 height EINA_UNUSED)
-{
-   return NULL;
-}
-
-#ifdef BUILD_ECORE_EVAS_DIRECT3D
-
-EAPI Ecore_Evas *
-ecore_evas_direct3d_new(Ecore_Win32_Window *parent,
-                        int                 x,
-                        int                 y,
-                        int                 width,
-                        int                 height)
-{
-   return _ecore_evas_win32_new_internal(_ecore_evas_engine_direct3d_init,
-                                         parent,
-                                         x,
-                                         y,
-                                         width,
-                                         height);
-}
-
-#else
-
-EAPI Ecore_Evas *
-ecore_evas_direct3d_new(Ecore_Win32_Window *parent EINA_UNUSED,
-                        int                 x EINA_UNUSED,
-                        int                 y EINA_UNUSED,
-                        int                 width EINA_UNUSED,
-                        int                 height EINA_UNUSED)
-{
-   return NULL;
-}
-
-#endif /* ! BUILD_ECORE_EVAS_DIRECT3D */
-
-
-#ifdef BUILD_ECORE_EVAS_OPENGL_GLEW
-
-EAPI Ecore_Evas *
-ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
-                       int                 x,
-                       int                 y,
-                       int                 width,
-                       int                 height)
-{
-   return _ecore_evas_win32_new_internal(_ecore_evas_engine_opengl_glew_init,
-                                         parent,
-                                         x,
-                                         y,
-                                         width,
-                                         height);
-}
-
-#else
-
-EAPI Ecore_Evas *
-ecore_evas_gl_glew_new(Ecore_Win32_Window *parent EINA_UNUSED,
-                       int                 x EINA_UNUSED,
-                       int                 y EINA_UNUSED,
-                       int                 width EINA_UNUSED,
-                       int                 height EINA_UNUSED)
-{
-   return NULL;
-}
-
-#endif /* BUILD_ECORE_EVAS_OPENGL_GLEW */
-
 static Ecore_Win32_Window *
 _ecore_evas_win32_window_get(const Ecore_Evas *ee)
 {