diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/modules/engines/fb/Makefile.in | 8 | ||||
-rw-r--r-- | libraries/evas/src/modules/engines/fb/evas_engine.c | 13 | ||||
-rw-r--r-- | libraries/evas/src/modules/engines/fb/evas_outbuf.c | 7 |
3 files changed, 13 insertions, 15 deletions
diff --git a/libraries/evas/src/modules/engines/fb/Makefile.in b/libraries/evas/src/modules/engines/fb/Makefile.in index 1e82b34..31d222a 100644 --- a/libraries/evas/src/modules/engines/fb/Makefile.in +++ b/libraries/evas/src/modules/engines/fb/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/fb/evas_engine.c b/libraries/evas/src/modules/engines/fb/evas_engine.c index 7681b00..e15c02b 100644 --- a/libraries/evas/src/modules/engines/fb/evas_engine.c +++ b/libraries/evas/src/modules/engines/fb/evas_engine.c | |||
@@ -74,7 +74,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh) | |||
74 | 74 | ||
75 | /* engine api this module provides */ | 75 | /* engine api this module provides */ |
76 | static void * | 76 | static void * |
77 | eng_info(Evas *e) | 77 | eng_info(Evas *e __UNUSED__) |
78 | { | 78 | { |
79 | Evas_Engine_Info_FB *info; | 79 | Evas_Engine_Info_FB *info; |
80 | info = calloc(1, sizeof(Evas_Engine_Info_FB)); | 80 | info = calloc(1, sizeof(Evas_Engine_Info_FB)); |
@@ -82,7 +82,6 @@ eng_info(Evas *e) | |||
82 | info->magic.magic = rand(); | 82 | info->magic.magic = rand(); |
83 | info->render_mode = EVAS_RENDER_MODE_BLOCKING; | 83 | info->render_mode = EVAS_RENDER_MODE_BLOCKING; |
84 | return info; | 84 | return info; |
85 | e = NULL; | ||
86 | } | 85 | } |
87 | 86 | ||
88 | static void | 87 | static void |
@@ -231,19 +230,13 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int | |||
231 | } | 230 | } |
232 | 231 | ||
233 | static void | 232 | static void |
234 | eng_output_flush(void *data) | 233 | eng_output_flush(void *data __UNUSED__) |
235 | { | 234 | { |
236 | Render_Engine *re; | ||
237 | |||
238 | re = (Render_Engine *)data; | ||
239 | } | 235 | } |
240 | 236 | ||
241 | static void | 237 | static void |
242 | eng_output_idle_flush(void *data) | 238 | eng_output_idle_flush(void *data __UNUSED__) |
243 | { | 239 | { |
244 | Render_Engine *re; | ||
245 | |||
246 | re = (Render_Engine *)data; | ||
247 | } | 240 | } |
248 | 241 | ||
249 | static Eina_Bool | 242 | static Eina_Bool |
diff --git a/libraries/evas/src/modules/engines/fb/evas_outbuf.c b/libraries/evas/src/modules/engines/fb/evas_outbuf.c index 57cf7a6..7ae24c5 100644 --- a/libraries/evas/src/modules/engines/fb/evas_outbuf.c +++ b/libraries/evas/src/modules/engines/fb/evas_outbuf.c | |||
@@ -25,7 +25,7 @@ evas_fb_outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, | |||
25 | /* setup window and/or fb */ | 25 | /* setup window and/or fb */ |
26 | /* if (dithered) create backbuf */ | 26 | /* if (dithered) create backbuf */ |
27 | Outbuf *buf; | 27 | Outbuf *buf; |
28 | int fb_fd = -1; | 28 | int fb_fd; |
29 | int fb_depth; | 29 | int fb_depth; |
30 | 30 | ||
31 | fb_depth = -1; | 31 | fb_depth = -1; |
@@ -51,6 +51,11 @@ evas_fb_outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, | |||
51 | return NULL; | 51 | return NULL; |
52 | } | 52 | } |
53 | fb_fd = fb_postinit(buf->priv.fb.fb); | 53 | fb_fd = fb_postinit(buf->priv.fb.fb); |
54 | if (fb_fd < 1) | ||
55 | { | ||
56 | free(buf); | ||
57 | return NULL; | ||
58 | } | ||
54 | 59 | ||
55 | if (rot == 0 || rot == 180) | 60 | if (rot == 0 || rot == 180) |
56 | { | 61 | { |