summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/drm/evas_engine.h
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-04-08 13:57:58 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2015-04-10 11:09:51 +0200
commit53ecea12782ee54febaebf5ebe065f5fcaf7c8c0 (patch)
tree1ea4c9501bac3680bdecf81d6fcb1a3221740826 /src/modules/evas/engines/drm/evas_engine.h
parent745192fd194fb9eb8f84db77e6e7a35dc9a782c2 (diff)
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>
Diffstat (limited to 'src/modules/evas/engines/drm/evas_engine.h')
-rw-r--r--src/modules/evas/engines/drm/evas_engine.h61
1 files changed, 8 insertions, 53 deletions
diff --git a/src/modules/evas/engines/drm/evas_engine.h b/src/modules/evas/engines/drm/evas_engine.h
index 7a4dffe26a..1f180cfa36 100644
--- a/src/modules/evas/engines/drm/evas_engine.h
+++ b/src/modules/evas/engines/drm/evas_engine.h
@@ -1,21 +1,11 @@
1#ifndef EVAS_ENGINE_H 1#ifndef EVAS_ENGINE_H
2# define EVAS_ENGINE_H 2# define EVAS_ENGINE_H
3 3
4#include "evas_common_private.h" 4# include "evas_common_private.h"
5#include "evas_macros.h" 5# include "evas_macros.h"
6#include "evas_private.h" 6# include "evas_private.h"
7#include "Evas.h" 7# include "Evas.h"
8#include "Evas_Engine_Drm.h" 8# include "Evas_Engine_Drm.h"
9
10#include <xf86drm.h>
11#include <xf86drmMode.h>
12#include <drm_fourcc.h>
13
14#include <signal.h>
15#include <sys/ioctl.h>
16#include <sys/types.h>
17#include <unistd.h>
18#include <fcntl.h>
19 9
20#include "../software_generic/Evas_Engine_Software_Generic.h" 10#include "../software_generic/Evas_Engine_Software_Generic.h"
21 11
@@ -46,26 +36,6 @@ extern int _evas_engine_drm_log_dom;
46# endif 36# endif
47# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__) 37# define CRI(...) EINA_LOG_DOM_CRIT(_evas_engine_drm_log_dom, __VA_ARGS__)
48 38
49/* define a maximum number of 'buffers' (double-buff, triple-buff, etc) */
50# define NUM_BUFFERS 2
51
52typedef struct _Plane Plane;
53
54struct _Plane
55{
56 unsigned int id;
57 unsigned int crtcs;
58
59 struct
60 {
61 unsigned int x, y;
62 unsigned int w, h;
63 } src, dst;
64
65 unsigned int num_formats;
66 unsigned int formats[];
67};
68
69struct _Outbuf 39struct _Outbuf
70{ 40{
71 Evas_Engine_Info_Drm *info; 41 Evas_Engine_Info_Drm *info;
@@ -76,24 +46,13 @@ struct _Outbuf
76 46
77 struct 47 struct
78 { 48 {
79 Ecore_Drm_Fb *buffer[NUM_BUFFERS]; 49 Ecore_Drm_Fb *buffer[4];
80 50
81 Eina_List *pending_writes; 51 Eina_List *pending_writes;
82 Eina_List *planes;
83
84# ifdef HAVE_DRM_HW_ACCEL
85 void *surface;
86# endif
87 52
88 int fd; 53 unsigned int crtc_id, conn_id, buffer_id;
89 unsigned int conn, crtc, fb;
90 54
91 int curr, last, num; 55 int curr, last, num;
92
93 drmModeModeInfo mode;
94 drmEventContext ctx;
95
96 Eina_Bool pending_flip : 1;
97 } priv; 56 } priv;
98 57
99 Eina_Bool destination_alpha : 1; 58 Eina_Bool destination_alpha : 1;
@@ -104,14 +63,10 @@ Outbuf *evas_outbuf_setup(Evas_Engine_Info_Drm *info, int w, int h);
104void evas_outbuf_free(Outbuf *ob); 63void evas_outbuf_free(Outbuf *ob);
105void evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth); 64void evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth);
106Render_Engine_Swap_Mode evas_outbuf_buffer_state_get(Outbuf *ob); 65Render_Engine_Swap_Mode evas_outbuf_buffer_state_get(Outbuf *ob);
107int evas_outbuf_get_rot(Outbuf *ob); 66int evas_outbuf_rot_get(Outbuf *ob);
108void *evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); 67void *evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch);
109void evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h); 68void evas_outbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, int w, int h);
110void evas_outbuf_update_region_free(Outbuf *ob, RGBA_Image *update); 69void evas_outbuf_update_region_free(Outbuf *ob, RGBA_Image *update);
111void evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode); 70void evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode render_mode);
112 71
113Eina_Bool evas_drm_outbuf_setup(Outbuf *ob);
114void evas_drm_outbuf_framebuffer_set(Outbuf *ob, Ecore_Drm_Fb *buffer);
115Eina_Bool evas_drm_framebuffer_send(Outbuf *ob, Ecore_Drm_Fb *buffer);
116
117#endif 72#endif