evas-drm: Cleanup evas_engine header file

Summary: With the evas drm engine refactor, a lot of these fields in
the Outbuf structure are unused so remove them. This also removes
unused private function declarations.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>

diff --git a/src/modules/evas/engines/drm/evas_engine.h b/src/modules/evas/engines/drm/evas_engine.h
index 7a4dffe..1f180cf 100644 (file)
--- a/src/modules/evas/engines/drm/evas_engine.h
+++ b/src/modules/evas/engines/drm/evas_engine.h
@@ -1,21 +1,11 @@
 #ifndef EVAS_ENGINE_H
 # define EVAS_ENGINE_H
 
-#include "evas_common_private.h"
-#include "evas_macros.h"
-#include "evas_private.h"
-#include "Evas.h"
-#include "Evas_Engine_Drm.h"
-
-#include <xf86drm.h>
-#include <xf86drmMode.h>
-#include <drm_fourcc.h>
-
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
+# include "evas_common_private.h"
+# include "evas_macros.h"
+# include "evas_private.h"
+# include "Evas.h"
+# include "Evas_Engine_Drm.h"
 
 #include "../software_generic/Evas_Engine_Software_Generic.h"
 
@@ -46,26 +36,6 @@ extern int _evas_engine_drm_log_dom;
 # endif
 # define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__)
 
-/* define a maximum number of 'buffers' (double-buff, triple-buff, etc) */
-# define NUM_BUFFERS 2
-
-typedef struct _Plane Plane;
-
-struct _Plane
-{
-   unsigned int id;
-   unsigned int crtcs;
-
-   struct 
-     {
-        unsigned int x, y;
-        unsigned int w, h;
-     } src, dst;
-
-   unsigned int num_formats;
-   unsigned int formats[];
-};
-
 struct _Outbuf
 {
    Evas_Engine_Info_Drm *info;
@@ -76,24 +46,13 @@ struct _Outbuf
 
    struct
    {
-      Ecore_Drm_Fb *buffer[NUM_BUFFERS];
+      Ecore_Drm_Fb *buffer[4];
 
       Eina_List *pending_writes;
-      Eina_List *planes;
-
-# ifdef HAVE_DRM_HW_ACCEL
-      void *surface;
-# endif
 
-      int fd;
-      unsigned int conn, crtc, fb;
+      unsigned int crtc_id, conn_id, buffer_id;
 
       int curr, last, num;
-
-      drmModeModeInfo mode;
-      drmEventContext ctx;
-
-      Eina_Bool pending_flip : 1;
    } priv;
 
    Eina_Bool destination_alpha : 1;
@@ -104,14 +63,10 @@ Outbuf *evas_outbuf_setup(Evas_Engine_Info_Drm *info, int w, int h);
 void evas_outbuf_free(Outbuf *ob);
 void evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth);
 Render_Engine_Swap_Mode evas_outbuf_buffer_state_get(Outbuf *ob);
-int evas_outbuf_get_rot(Outbuf *ob);
+int evas_outbuf_rot_get(Outbuf *ob);
 void *evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
 void evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h);
 void evas_outbuf_update_region_free(Outbuf *ob, RGBA_Image *update);
 void evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode);
 
-Eina_Bool evas_drm_outbuf_setup(Outbuf *ob);
-void evas_drm_outbuf_framebuffer_set(Outbuf *ob, Ecore_Drm_Fb *buffer);
-Eina_Bool evas_drm_framebuffer_send(Outbuf *ob, Ecore_Drm_Fb *buffer);
-
 #endif